diff --git a/docs/accessibilityinfo.md b/docs/accessibilityinfo.md
index 1c3ed89bc88..b585efd6f6c 100644
--- a/docs/accessibilityinfo.md
+++ b/docs/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/docs/appearance.md b/docs/appearance.md
index 047c9b1e7c5..22cc758f47f 100644
--- a/docs/appearance.md
+++ b/docs/appearance.md
@@ -122,7 +122,7 @@ Supported values:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change. On iOS and Android, the `colorScheme` value in the callback is always `'light'` or `'dark'`.
diff --git a/docs/appstate.md b/docs/appstate.md
index b5d6ad607f5..cc68ba5cc05 100644
--- a/docs/appstate.md
+++ b/docs/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/docs/backhandler.md b/docs/backhandler.md
index 9e1f2f7a94e..06237d2a0e5 100644
--- a/docs/backhandler.md
+++ b/docs/backhandler.md
@@ -102,7 +102,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -124,7 +124,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/docs/dimensions.md b/docs/dimensions.md
index b5bfa7635c7..f61f7ad2980 100644
--- a/docs/dimensions.md
+++ b/docs/dimensions.md
@@ -105,7 +105,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/docs/keyboard.md b/docs/keyboard.md
index c4951b2058c..6566ec1356d 100644
--- a/docs/keyboard.md
+++ b/docs/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/docs/linking.md b/docs/linking.md
index 939292522d5..e6095448cd0 100644
--- a/docs/linking.md
+++ b/docs/linking.md
@@ -557,7 +557,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.77/accessibilityinfo.md b/website/versioned_docs/version-0.77/accessibilityinfo.md
index fab883898c3..c01d4fc2212 100644
--- a/website/versioned_docs/version-0.77/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.77/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.77/appearance.md b/website/versioned_docs/version-0.77/appearance.md
index 32f32367a74..d42d1dc3777 100644
--- a/website/versioned_docs/version-0.77/appearance.md
+++ b/website/versioned_docs/version-0.77/appearance.md
@@ -96,7 +96,7 @@ Supported color schemes:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change.
diff --git a/website/versioned_docs/version-0.77/appstate.md b/website/versioned_docs/version-0.77/appstate.md
index b776907d3e1..52f00a8150d 100644
--- a/website/versioned_docs/version-0.77/appstate.md
+++ b/website/versioned_docs/version-0.77/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.77/backhandler.md b/website/versioned_docs/version-0.77/backhandler.md
index 66f0a212faa..ec234a07792 100644
--- a/website/versioned_docs/version-0.77/backhandler.md
+++ b/website/versioned_docs/version-0.77/backhandler.md
@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -122,7 +122,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.77/dimensions.md b/website/versioned_docs/version-0.77/dimensions.md
index cf329d65f01..2be903628d6 100644
--- a/website/versioned_docs/version-0.77/dimensions.md
+++ b/website/versioned_docs/version-0.77/dimensions.md
@@ -94,7 +94,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.77/keyboard.md b/website/versioned_docs/version-0.77/keyboard.md
index f09f30b85aa..5b58b128c1e 100644
--- a/website/versioned_docs/version-0.77/keyboard.md
+++ b/website/versioned_docs/version-0.77/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.77/linking.md b/website/versioned_docs/version-0.77/linking.md
index 27e965e69e7..37b1b747ce8 100644
--- a/website/versioned_docs/version-0.77/linking.md
+++ b/website/versioned_docs/version-0.77/linking.md
@@ -536,7 +536,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.78/accessibilityinfo.md b/website/versioned_docs/version-0.78/accessibilityinfo.md
index fab883898c3..c01d4fc2212 100644
--- a/website/versioned_docs/version-0.78/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.78/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.78/appearance.md b/website/versioned_docs/version-0.78/appearance.md
index 32f32367a74..d42d1dc3777 100644
--- a/website/versioned_docs/version-0.78/appearance.md
+++ b/website/versioned_docs/version-0.78/appearance.md
@@ -96,7 +96,7 @@ Supported color schemes:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change.
diff --git a/website/versioned_docs/version-0.78/appstate.md b/website/versioned_docs/version-0.78/appstate.md
index b776907d3e1..52f00a8150d 100644
--- a/website/versioned_docs/version-0.78/appstate.md
+++ b/website/versioned_docs/version-0.78/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.78/backhandler.md b/website/versioned_docs/version-0.78/backhandler.md
index 66f0a212faa..ec234a07792 100644
--- a/website/versioned_docs/version-0.78/backhandler.md
+++ b/website/versioned_docs/version-0.78/backhandler.md
@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -122,7 +122,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.78/dimensions.md b/website/versioned_docs/version-0.78/dimensions.md
index cf329d65f01..2be903628d6 100644
--- a/website/versioned_docs/version-0.78/dimensions.md
+++ b/website/versioned_docs/version-0.78/dimensions.md
@@ -94,7 +94,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.78/keyboard.md b/website/versioned_docs/version-0.78/keyboard.md
index f09f30b85aa..5b58b128c1e 100644
--- a/website/versioned_docs/version-0.78/keyboard.md
+++ b/website/versioned_docs/version-0.78/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.78/linking.md b/website/versioned_docs/version-0.78/linking.md
index 27e965e69e7..37b1b747ce8 100644
--- a/website/versioned_docs/version-0.78/linking.md
+++ b/website/versioned_docs/version-0.78/linking.md
@@ -536,7 +536,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.79/accessibilityinfo.md b/website/versioned_docs/version-0.79/accessibilityinfo.md
index fab883898c3..c01d4fc2212 100644
--- a/website/versioned_docs/version-0.79/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.79/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.79/appearance.md b/website/versioned_docs/version-0.79/appearance.md
index 32f32367a74..d42d1dc3777 100644
--- a/website/versioned_docs/version-0.79/appearance.md
+++ b/website/versioned_docs/version-0.79/appearance.md
@@ -96,7 +96,7 @@ Supported color schemes:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change.
diff --git a/website/versioned_docs/version-0.79/appstate.md b/website/versioned_docs/version-0.79/appstate.md
index b776907d3e1..52f00a8150d 100644
--- a/website/versioned_docs/version-0.79/appstate.md
+++ b/website/versioned_docs/version-0.79/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.79/backhandler.md b/website/versioned_docs/version-0.79/backhandler.md
index 66f0a212faa..ec234a07792 100644
--- a/website/versioned_docs/version-0.79/backhandler.md
+++ b/website/versioned_docs/version-0.79/backhandler.md
@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -122,7 +122,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.79/dimensions.md b/website/versioned_docs/version-0.79/dimensions.md
index cf329d65f01..2be903628d6 100644
--- a/website/versioned_docs/version-0.79/dimensions.md
+++ b/website/versioned_docs/version-0.79/dimensions.md
@@ -94,7 +94,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.79/keyboard.md b/website/versioned_docs/version-0.79/keyboard.md
index f09f30b85aa..5b58b128c1e 100644
--- a/website/versioned_docs/version-0.79/keyboard.md
+++ b/website/versioned_docs/version-0.79/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.79/linking.md b/website/versioned_docs/version-0.79/linking.md
index ae351b9f484..2b7fed48b77 100644
--- a/website/versioned_docs/version-0.79/linking.md
+++ b/website/versioned_docs/version-0.79/linking.md
@@ -552,7 +552,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.80/accessibilityinfo.md b/website/versioned_docs/version-0.80/accessibilityinfo.md
index c42fda62a2c..9e9d00fdabb 100644
--- a/website/versioned_docs/version-0.80/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.80/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.80/appearance.md b/website/versioned_docs/version-0.80/appearance.md
index 32f32367a74..d42d1dc3777 100644
--- a/website/versioned_docs/version-0.80/appearance.md
+++ b/website/versioned_docs/version-0.80/appearance.md
@@ -96,7 +96,7 @@ Supported color schemes:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change.
diff --git a/website/versioned_docs/version-0.80/appstate.md b/website/versioned_docs/version-0.80/appstate.md
index 4980ef439da..daced5fe7c8 100644
--- a/website/versioned_docs/version-0.80/appstate.md
+++ b/website/versioned_docs/version-0.80/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.80/backhandler.md b/website/versioned_docs/version-0.80/backhandler.md
index 4061b19a2ff..4cf371f1677 100644
--- a/website/versioned_docs/version-0.80/backhandler.md
+++ b/website/versioned_docs/version-0.80/backhandler.md
@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -122,7 +122,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.80/dimensions.md b/website/versioned_docs/version-0.80/dimensions.md
index d548e2c0b47..a6c6cda7ae3 100644
--- a/website/versioned_docs/version-0.80/dimensions.md
+++ b/website/versioned_docs/version-0.80/dimensions.md
@@ -94,7 +94,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.80/keyboard.md b/website/versioned_docs/version-0.80/keyboard.md
index 613f221af94..a1594b4c03c 100644
--- a/website/versioned_docs/version-0.80/keyboard.md
+++ b/website/versioned_docs/version-0.80/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.80/linking.md b/website/versioned_docs/version-0.80/linking.md
index 1e041b84d1c..2375e4d6502 100644
--- a/website/versioned_docs/version-0.80/linking.md
+++ b/website/versioned_docs/version-0.80/linking.md
@@ -552,7 +552,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.81/accessibilityinfo.md b/website/versioned_docs/version-0.81/accessibilityinfo.md
index c42fda62a2c..9e9d00fdabb 100644
--- a/website/versioned_docs/version-0.81/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.81/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.81/appearance.md b/website/versioned_docs/version-0.81/appearance.md
index 32f32367a74..d42d1dc3777 100644
--- a/website/versioned_docs/version-0.81/appearance.md
+++ b/website/versioned_docs/version-0.81/appearance.md
@@ -96,7 +96,7 @@ Supported color schemes:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change.
diff --git a/website/versioned_docs/version-0.81/appstate.md b/website/versioned_docs/version-0.81/appstate.md
index 4980ef439da..daced5fe7c8 100644
--- a/website/versioned_docs/version-0.81/appstate.md
+++ b/website/versioned_docs/version-0.81/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.81/backhandler.md b/website/versioned_docs/version-0.81/backhandler.md
index 4061b19a2ff..4cf371f1677 100644
--- a/website/versioned_docs/version-0.81/backhandler.md
+++ b/website/versioned_docs/version-0.81/backhandler.md
@@ -100,7 +100,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -122,7 +122,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.81/dimensions.md b/website/versioned_docs/version-0.81/dimensions.md
index d548e2c0b47..a6c6cda7ae3 100644
--- a/website/versioned_docs/version-0.81/dimensions.md
+++ b/website/versioned_docs/version-0.81/dimensions.md
@@ -94,7 +94,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.81/keyboard.md b/website/versioned_docs/version-0.81/keyboard.md
index 613f221af94..a1594b4c03c 100644
--- a/website/versioned_docs/version-0.81/keyboard.md
+++ b/website/versioned_docs/version-0.81/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.81/linking.md b/website/versioned_docs/version-0.81/linking.md
index 1e041b84d1c..2375e4d6502 100644
--- a/website/versioned_docs/version-0.81/linking.md
+++ b/website/versioned_docs/version-0.81/linking.md
@@ -552,7 +552,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.82/accessibilityinfo.md b/website/versioned_docs/version-0.82/accessibilityinfo.md
index 09743beff5f..dab97367c30 100644
--- a/website/versioned_docs/version-0.82/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.82/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.82/appearance.md b/website/versioned_docs/version-0.82/appearance.md
index fd2d2b4d57d..c1e390b0e4f 100644
--- a/website/versioned_docs/version-0.82/appearance.md
+++ b/website/versioned_docs/version-0.82/appearance.md
@@ -108,7 +108,7 @@ The change will not affect the system's selected interface style or any style se
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change.
diff --git a/website/versioned_docs/version-0.82/appstate.md b/website/versioned_docs/version-0.82/appstate.md
index 4980ef439da..daced5fe7c8 100644
--- a/website/versioned_docs/version-0.82/appstate.md
+++ b/website/versioned_docs/version-0.82/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.82/backhandler.md b/website/versioned_docs/version-0.82/backhandler.md
index c07a4c5d029..c243182f1d9 100644
--- a/website/versioned_docs/version-0.82/backhandler.md
+++ b/website/versioned_docs/version-0.82/backhandler.md
@@ -102,7 +102,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -124,7 +124,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.82/dimensions.md b/website/versioned_docs/version-0.82/dimensions.md
index eb3673eca5b..f9dcdd6686a 100644
--- a/website/versioned_docs/version-0.82/dimensions.md
+++ b/website/versioned_docs/version-0.82/dimensions.md
@@ -98,7 +98,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.82/keyboard.md b/website/versioned_docs/version-0.82/keyboard.md
index de1ec7b870b..a91df87a14d 100644
--- a/website/versioned_docs/version-0.82/keyboard.md
+++ b/website/versioned_docs/version-0.82/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.82/linking.md b/website/versioned_docs/version-0.82/linking.md
index 18875244905..db73f943cc3 100644
--- a/website/versioned_docs/version-0.82/linking.md
+++ b/website/versioned_docs/version-0.82/linking.md
@@ -557,7 +557,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.83/accessibilityinfo.md b/website/versioned_docs/version-0.83/accessibilityinfo.md
index c3b47920418..cfba1e6977e 100644
--- a/website/versioned_docs/version-0.83/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.83/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.83/appearance.md b/website/versioned_docs/version-0.83/appearance.md
index fd2d2b4d57d..c1e390b0e4f 100644
--- a/website/versioned_docs/version-0.83/appearance.md
+++ b/website/versioned_docs/version-0.83/appearance.md
@@ -108,7 +108,7 @@ The change will not affect the system's selected interface style or any style se
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change.
diff --git a/website/versioned_docs/version-0.83/appstate.md b/website/versioned_docs/version-0.83/appstate.md
index 4980ef439da..daced5fe7c8 100644
--- a/website/versioned_docs/version-0.83/appstate.md
+++ b/website/versioned_docs/version-0.83/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.83/backhandler.md b/website/versioned_docs/version-0.83/backhandler.md
index c07a4c5d029..c243182f1d9 100644
--- a/website/versioned_docs/version-0.83/backhandler.md
+++ b/website/versioned_docs/version-0.83/backhandler.md
@@ -102,7 +102,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -124,7 +124,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.83/dimensions.md b/website/versioned_docs/version-0.83/dimensions.md
index eb3673eca5b..f9dcdd6686a 100644
--- a/website/versioned_docs/version-0.83/dimensions.md
+++ b/website/versioned_docs/version-0.83/dimensions.md
@@ -98,7 +98,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.83/keyboard.md b/website/versioned_docs/version-0.83/keyboard.md
index de1ec7b870b..a91df87a14d 100644
--- a/website/versioned_docs/version-0.83/keyboard.md
+++ b/website/versioned_docs/version-0.83/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.83/linking.md b/website/versioned_docs/version-0.83/linking.md
index 18875244905..db73f943cc3 100644
--- a/website/versioned_docs/version-0.83/linking.md
+++ b/website/versioned_docs/version-0.83/linking.md
@@ -557,7 +557,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.84/accessibilityinfo.md b/website/versioned_docs/version-0.84/accessibilityinfo.md
index c3b47920418..cfba1e6977e 100644
--- a/website/versioned_docs/version-0.84/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.84/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.84/appearance.md b/website/versioned_docs/version-0.84/appearance.md
index fd2d2b4d57d..c1e390b0e4f 100644
--- a/website/versioned_docs/version-0.84/appearance.md
+++ b/website/versioned_docs/version-0.84/appearance.md
@@ -108,7 +108,7 @@ The change will not affect the system's selected interface style or any style se
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change.
diff --git a/website/versioned_docs/version-0.84/appstate.md b/website/versioned_docs/version-0.84/appstate.md
index 53ee6224c47..e6627d2ed89 100644
--- a/website/versioned_docs/version-0.84/appstate.md
+++ b/website/versioned_docs/version-0.84/appstate.md
@@ -103,7 +103,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.84/backhandler.md b/website/versioned_docs/version-0.84/backhandler.md
index c07a4c5d029..c243182f1d9 100644
--- a/website/versioned_docs/version-0.84/backhandler.md
+++ b/website/versioned_docs/version-0.84/backhandler.md
@@ -102,7 +102,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -124,7 +124,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.84/dimensions.md b/website/versioned_docs/version-0.84/dimensions.md
index eb3673eca5b..f9dcdd6686a 100644
--- a/website/versioned_docs/version-0.84/dimensions.md
+++ b/website/versioned_docs/version-0.84/dimensions.md
@@ -98,7 +98,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.84/keyboard.md b/website/versioned_docs/version-0.84/keyboard.md
index de1ec7b870b..a91df87a14d 100644
--- a/website/versioned_docs/version-0.84/keyboard.md
+++ b/website/versioned_docs/version-0.84/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.84/linking.md b/website/versioned_docs/version-0.84/linking.md
index 18875244905..db73f943cc3 100644
--- a/website/versioned_docs/version-0.84/linking.md
+++ b/website/versioned_docs/version-0.84/linking.md
@@ -557,7 +557,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.85/accessibilityinfo.md b/website/versioned_docs/version-0.85/accessibilityinfo.md
index c3b47920418..cfba1e6977e 100644
--- a/website/versioned_docs/version-0.85/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.85/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.85/appearance.md b/website/versioned_docs/version-0.85/appearance.md
index b69ca191d63..9c441ddaab8 100644
--- a/website/versioned_docs/version-0.85/appearance.md
+++ b/website/versioned_docs/version-0.85/appearance.md
@@ -122,7 +122,7 @@ Supported values:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change. On iOS and Android, the `colorScheme` value in the callback is always `'light'` or `'dark'`.
diff --git a/website/versioned_docs/version-0.85/appstate.md b/website/versioned_docs/version-0.85/appstate.md
index 4980ef439da..daced5fe7c8 100644
--- a/website/versioned_docs/version-0.85/appstate.md
+++ b/website/versioned_docs/version-0.85/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.85/backhandler.md b/website/versioned_docs/version-0.85/backhandler.md
index c07a4c5d029..c243182f1d9 100644
--- a/website/versioned_docs/version-0.85/backhandler.md
+++ b/website/versioned_docs/version-0.85/backhandler.md
@@ -102,7 +102,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -124,7 +124,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.85/dimensions.md b/website/versioned_docs/version-0.85/dimensions.md
index eb3673eca5b..f9dcdd6686a 100644
--- a/website/versioned_docs/version-0.85/dimensions.md
+++ b/website/versioned_docs/version-0.85/dimensions.md
@@ -98,7 +98,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.85/keyboard.md b/website/versioned_docs/version-0.85/keyboard.md
index de1ec7b870b..a91df87a14d 100644
--- a/website/versioned_docs/version-0.85/keyboard.md
+++ b/website/versioned_docs/version-0.85/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.85/linking.md b/website/versioned_docs/version-0.85/linking.md
index 18875244905..db73f943cc3 100644
--- a/website/versioned_docs/version-0.85/linking.md
+++ b/website/versioned_docs/version-0.85/linking.md
@@ -557,7 +557,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.86/accessibilityinfo.md b/website/versioned_docs/version-0.86/accessibilityinfo.md
index c3b47920418..cfba1e6977e 100644
--- a/website/versioned_docs/version-0.86/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.86/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.86/appearance.md b/website/versioned_docs/version-0.86/appearance.md
index 44f16750db0..bf08eb38c36 100644
--- a/website/versioned_docs/version-0.86/appearance.md
+++ b/website/versioned_docs/version-0.86/appearance.md
@@ -122,7 +122,7 @@ Supported values:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change. On iOS and Android, the `colorScheme` value in the callback is always `'light'` or `'dark'`.
diff --git a/website/versioned_docs/version-0.86/appstate.md b/website/versioned_docs/version-0.86/appstate.md
index 4980ef439da..daced5fe7c8 100644
--- a/website/versioned_docs/version-0.86/appstate.md
+++ b/website/versioned_docs/version-0.86/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.86/backhandler.md b/website/versioned_docs/version-0.86/backhandler.md
index c07a4c5d029..c243182f1d9 100644
--- a/website/versioned_docs/version-0.86/backhandler.md
+++ b/website/versioned_docs/version-0.86/backhandler.md
@@ -102,7 +102,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -124,7 +124,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.86/dimensions.md b/website/versioned_docs/version-0.86/dimensions.md
index eb3673eca5b..f9dcdd6686a 100644
--- a/website/versioned_docs/version-0.86/dimensions.md
+++ b/website/versioned_docs/version-0.86/dimensions.md
@@ -98,7 +98,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.86/keyboard.md b/website/versioned_docs/version-0.86/keyboard.md
index de1ec7b870b..a91df87a14d 100644
--- a/website/versioned_docs/version-0.86/keyboard.md
+++ b/website/versioned_docs/version-0.86/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.86/linking.md b/website/versioned_docs/version-0.86/linking.md
index 18875244905..db73f943cc3 100644
--- a/website/versioned_docs/version-0.86/linking.md
+++ b/website/versioned_docs/version-0.86/linking.md
@@ -557,7 +557,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.
diff --git a/website/versioned_docs/version-0.87/accessibilityinfo.md b/website/versioned_docs/version-0.87/accessibilityinfo.md
index 1c3ed89bc88..b585efd6f6c 100644
--- a/website/versioned_docs/version-0.87/accessibilityinfo.md
+++ b/website/versioned_docs/version-0.87/accessibilityinfo.md
@@ -85,7 +85,7 @@ static addEventListener(
   handler: (
     event: AccessibilityChangeEvent | AccessibilityAnnouncementFinishedEvent,
   ) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.87/appearance.md b/website/versioned_docs/version-0.87/appearance.md
index 047c9b1e7c5..22cc758f47f 100644
--- a/website/versioned_docs/version-0.87/appearance.md
+++ b/website/versioned_docs/version-0.87/appearance.md
@@ -122,7 +122,7 @@ Supported values:
 ```tsx
 static addChangeListener(
   listener: (preferences: {colorScheme: 'light' | 'dark' | null}) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Add an event handler that is fired when appearance preferences change. On iOS and Android, the `colorScheme` value in the callback is always `'light'` or `'dark'`.
diff --git a/website/versioned_docs/version-0.87/appstate.md b/website/versioned_docs/version-0.87/appstate.md
index b5d6ad607f5..cc68ba5cc05 100644
--- a/website/versioned_docs/version-0.87/appstate.md
+++ b/website/versioned_docs/version-0.87/appstate.md
@@ -107,7 +107,7 @@ Received when the user is not actively interacting with the app. Useful in situa
 static addEventListener(
   type: AppStateEvent,
   listener: (state: AppStateStatus) => void,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 Sets up a function that will be called whenever the specified event type on AppState occurs. Valid values for `eventType` are
diff --git a/website/versioned_docs/version-0.87/backhandler.md b/website/versioned_docs/version-0.87/backhandler.md
index 9e1f2f7a94e..06237d2a0e5 100644
--- a/website/versioned_docs/version-0.87/backhandler.md
+++ b/website/versioned_docs/version-0.87/backhandler.md
@@ -102,7 +102,7 @@ const styles = StyleSheet.create({
 export default App;
 ```
 
-`BackHandler.addEventListener` creates an event listener & returns a `NativeEventSubscription` object which should be cleared using `NativeEventSubscription.remove` method.
+`BackHandler.addEventListener` creates an event listener & returns an `EventSubscription` object which should be cleared using the `EventSubscription.remove` method.
 
 ## Usage with React Navigation
 
@@ -124,7 +124,7 @@ If you are using React Navigation to navigate across different screens, you can
 static addEventListener(
   eventName: BackPressEventName,
   handler: () => boolean | null | undefined,
-): NativeEventSubscription;
+): EventSubscription;
 ```
 
 ---
diff --git a/website/versioned_docs/version-0.87/dimensions.md b/website/versioned_docs/version-0.87/dimensions.md
index b5bfa7635c7..f61f7ad2980 100644
--- a/website/versioned_docs/version-0.87/dimensions.md
+++ b/website/versioned_docs/version-0.87/dimensions.md
@@ -105,7 +105,7 @@ static addEventListener(
     window,
     screen,
   }: DimensionsValue) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add an event handler. Supported events:
diff --git a/website/versioned_docs/version-0.87/keyboard.md b/website/versioned_docs/version-0.87/keyboard.md
index c4951b2058c..6566ec1356d 100644
--- a/website/versioned_docs/version-0.87/keyboard.md
+++ b/website/versioned_docs/version-0.87/keyboard.md
@@ -76,7 +76,7 @@ export default Example;
 static addListener: (
   eventType: KeyboardEventName,
   listener: KeyboardEventListener,
-) => EmitterSubscription;
+) => EventSubscription;
 ```
 
 The `addListener` function connects a JavaScript function to an identified native keyboard notification event.
diff --git a/website/versioned_docs/version-0.87/linking.md b/website/versioned_docs/version-0.87/linking.md
index 939292522d5..e6095448cd0 100644
--- a/website/versioned_docs/version-0.87/linking.md
+++ b/website/versioned_docs/version-0.87/linking.md
@@ -557,7 +557,7 @@ export default App;
 static addEventListener(
   type: 'url',
   handler: (event: {url: string}) => void,
-): EmitterSubscription;
+): EventSubscription;
 ```
 
 Add a handler to Linking changes by listening to the `url` event type and providing the handler.