diff --git a/android/racehorse/src/main/java/org/racehorse/ActivityPlugin.kt b/android/racehorse/src/main/java/org/racehorse/ActivityPlugin.kt
index 5226183f..3934d380 100644
--- a/android/racehorse/src/main/java/org/racehorse/ActivityPlugin.kt
+++ b/android/racehorse/src/main/java/org/racehorse/ActivityPlugin.kt
@@ -21,10 +21,7 @@ class GetActivityStateEvent : RequestEvent() {
 }
 
 class GetActivityInfoEvent : RequestEvent() {
-    class ResultEvent(val info: ActivityInfo) : ResponseEvent() {
-        @Deprecated("Delete in next release")
-        val activityInfo = info
-    }
+    class ResultEvent(val info: ActivityInfo) : ResponseEvent()
 }
 
 /**
diff --git a/android/racehorse/src/main/java/org/racehorse/BiometricEncryptedStoragePlugin.kt b/android/racehorse/src/main/java/org/racehorse/BiometricEncryptedStoragePlugin.kt
index d88c0b31..bf84b642 100644
--- a/android/racehorse/src/main/java/org/racehorse/BiometricEncryptedStoragePlugin.kt
+++ b/android/racehorse/src/main/java/org/racehorse/BiometricEncryptedStoragePlugin.kt
@@ -63,20 +63,14 @@ class GetBiometricEncryptedValueEvent(val key: String, val config: BiometricConf
  * Checks that the key exists in the storage.
  */
 class HasBiometricEncryptedValueEvent(val key: String) : RequestEvent() {
-    class ResultEvent(val isExisting: Boolean) : ResponseEvent() {
-        @Deprecated("Delete in next release")
-        val exists = isExisting
-    }
+    class ResultEvent(val isExisting: Boolean) : ResponseEvent()
 }
 
 /**
  * Deletes a value associated with the key.
  */
 class DeleteBiometricEncryptedValueEvent(val key: String) : RequestEvent() {
-    class ResultEvent(val isDeleted: Boolean) : ResponseEvent() {
-        @Deprecated("Delete in next release")
-        val deleted = isDeleted
-    }
+    class ResultEvent(val isDeleted: Boolean) : ResponseEvent()
 }
 
 /**
diff --git a/android/racehorse/src/main/java/org/racehorse/DevicePlugin.kt b/android/racehorse/src/main/java/org/racehorse/DevicePlugin.kt
index 30e7016e..5013ddf3 100644
--- a/android/racehorse/src/main/java/org/racehorse/DevicePlugin.kt
+++ b/android/racehorse/src/main/java/org/racehorse/DevicePlugin.kt
@@ -15,10 +15,7 @@ class Rect(val top: Float = 0f, val right: Float = 0f, val bottom: Float = 0f, v
  * Get OS and device versions.
  */
 class GetDeviceInfoEvent : RequestEvent() {
-    class ResultEvent(val info: DeviceInfo) : ResponseEvent() {
-        @Deprecated("Delete in next release")
-        val deviceInfo = info
-    }
+    class ResultEvent(val info: DeviceInfo) : ResponseEvent()
 }
 
 /**
diff --git a/android/racehorse/src/main/java/org/racehorse/DownloadPlugin.kt b/android/racehorse/src/main/java/org/racehorse/DownloadPlugin.kt
index fee382a6..37d94d2c 100644
--- a/android/racehorse/src/main/java/org/racehorse/DownloadPlugin.kt
+++ b/android/racehorse/src/main/java/org/racehorse/DownloadPlugin.kt
@@ -152,10 +152,7 @@ class GetAllDownloadsEvent : RequestEvent() {
  * longer be accessible through the download manager. If there is a downloaded file, partial or complete, it is deleted.
  */
 class RemoveDownloadEvent(var id: Long) : RequestEvent() {
-    class ResultEvent(val isRemoved: Boolean) : ResponseEvent() {
-        @Deprecated("Delete in next release")
-        val removed = isRemoved
-    }
+    class ResultEvent(val isRemoved: Boolean) : ResponseEvent()
 }
 
 open class DownloadPlugin(private val activity: ComponentActivity) {
diff --git a/android/racehorse/src/main/java/org/racehorse/EncryptedStoragePlugin.kt b/android/racehorse/src/main/java/org/racehorse/EncryptedStoragePlugin.kt
index d73e1f4f..fa198277 100644
--- a/android/racehorse/src/main/java/org/racehorse/EncryptedStoragePlugin.kt
+++ b/android/racehorse/src/main/java/org/racehorse/EncryptedStoragePlugin.kt
@@ -40,20 +40,14 @@ class GetEncryptedValueEvent(val key: String, val password: String) : RequestEve
  * Checks that the key exists in the storage.
  */
 class HasEncryptedValueEvent(val key: String) : RequestEvent() {
-    class ResultEvent(val isExisting: Boolean) : ResponseEvent() {
-        @Deprecated("Delete in next release")
-        val exists = isExisting
-    }
+    class ResultEvent(val isExisting: Boolean) : ResponseEvent()
 }
 
 /**
  * Deletes an encrypted value associated with the key.
  */
 class DeleteEncryptedValueEvent(val key: String) : RequestEvent() {
-    class ResultEvent(val isDeleted: Boolean) : ResponseEvent() {
-        @Deprecated("Delete in next release")
-        val deleted = isDeleted
-    }
+    class ResultEvent(val isDeleted: Boolean) : ResponseEvent()
 }
 
 /**
diff --git a/android/racehorse/src/main/java/org/racehorse/GooglePayPlugin.kt b/android/racehorse/src/main/java/org/racehorse/GooglePayPlugin.kt
index 2e61a70a..756a08bb 100644
--- a/android/racehorse/src/main/java/org/racehorse/GooglePayPlugin.kt
+++ b/android/racehorse/src/main/java/org/racehorse/GooglePayPlugin.kt
@@ -123,10 +123,7 @@ class GooglePayIsTokenizedEvent(
  * Open Google Pay app and reveal the card.
  */
 class GooglePayViewTokenEvent(val tokenId: String, val tokenServiceProvider: Int) : RequestEvent() {
-    class ResultEvent(val isOpened: Boolean) : ResponseEvent() {
-        @Deprecated("Delete in next release")
-        val opened = isOpened
-    }
+    class ResultEvent(val isOpened: Boolean) : ResponseEvent()
 }
 
 /**
diff --git a/web/example/src/examples/ActivityExample.tsx b/web/example/src/examples/ActivityExample.tsx
index f2ffd830..4ebfca1d 100644
--- a/web/example/src/examples/ActivityExample.tsx
+++ b/web/example/src/examples/ActivityExample.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { activityManager, ActivityResult, ActivityState, Intent, permissionsManager } from 'racehorse';
 import { FormattedJSON } from '../components/FormattedJSON';
 import { useActivityState } from '@racehorse/react';
@@ -11,7 +11,7 @@ const activityStateLabel = {
 
 export function ActivityExample() {
   const activityState = useActivityState();
-  const [activityInfo] = useState(activityManager.getActivityInfo);
+  const activityInfo = useMemo(activityManager.getActivityInfo, []);
   const [contactActivityResult, setContactActivityResult] = useState<ActivityResult | null>();
 
   useEffect(
@@ -57,8 +57,8 @@ export function ActivityExample() {
 
       <button
         onClick={() => {
-          permissionsManager.askForPermission('android.permission.READ_CONTACTS').then(granted => {
-            if (granted) {
+          permissionsManager.askForPermission('android.permission.READ_CONTACTS').then(isGranted => {
+            if (isGranted) {
               activityManager
                 .startActivityForResult({
                   // https://developer.android.com/guide/components/intents-common#Contacts
diff --git a/web/example/src/examples/BiometricEncryptedStorageExample.tsx b/web/example/src/examples/BiometricEncryptedStorageExample.tsx
index 3e479ea4..8cf0eb4c 100644
--- a/web/example/src/examples/BiometricEncryptedStorageExample.tsx
+++ b/web/example/src/examples/BiometricEncryptedStorageExample.tsx
@@ -58,8 +58,8 @@ export function BiometricEncryptedStorageExample() {
         </button>{' '}
         <button
           onClick={() => {
-            biometricEncryptedStorageManager.set(key, value, biometricConfig).then(ok => {
-              if (ok) {
+            biometricEncryptedStorageManager.set(key, value, biometricConfig).then(isSuccessful => {
+              if (isSuccessful) {
                 biometricEncryptedStorageManager.get(key, biometricConfig).then(setPersistedValue);
               } else {
                 console.log('Cannot set biometric storage entry: ' + key);
diff --git a/web/example/src/examples/BiometricExample.tsx b/web/example/src/examples/BiometricExample.tsx
index c698be42..212ddfc4 100644
--- a/web/example/src/examples/BiometricExample.tsx
+++ b/web/example/src/examples/BiometricExample.tsx
@@ -42,10 +42,10 @@ export function BiometricExample() {
         <p>
           <button
             onClick={() => {
-              biometricManager
-                .enrollBiometric(authenticators)
+              biometricManager.enrollBiometric(authenticators).then(() => {
                 // Trigger status update
-                .then(() => setAuthenticators(authenticators => [...authenticators]));
+                setAuthenticators(authenticators => [...authenticators]);
+              });
             }}
           >
             {'Enroll biometric'}
diff --git a/web/example/src/examples/DeviceExample.tsx b/web/example/src/examples/DeviceExample.tsx
index cc487548..f615e23c 100644
--- a/web/example/src/examples/DeviceExample.tsx
+++ b/web/example/src/examples/DeviceExample.tsx
@@ -1,11 +1,11 @@
-import React, { useState } from 'react';
+import React, { useMemo } from 'react';
 import { deviceManager } from 'racehorse';
 import { FormattedJSON } from '../components/FormattedJSON';
 
 export function DeviceExample() {
-  const [deviceInfo] = useState(deviceManager.getDeviceInfo);
-  const [preferredLocales] = useState(deviceManager.getPreferredLocales);
-  const [insets] = useState(deviceManager.getWindowInsets);
+  const deviceInfo = useMemo(deviceManager.getDeviceInfo, []);
+  const preferredLocales = useMemo(deviceManager.getPreferredLocales, []);
+  const insets = useMemo(deviceManager.getWindowInsets, []);
 
   return (
     <>
diff --git a/web/example/src/examples/EncryptedStorageExample.tsx b/web/example/src/examples/EncryptedStorageExample.tsx
index dc019713..bb31d082 100644
--- a/web/example/src/examples/EncryptedStorageExample.tsx
+++ b/web/example/src/examples/EncryptedStorageExample.tsx
@@ -60,8 +60,8 @@ export function EncryptedStorageExample() {
       <p>
         <button
           onClick={() => {
-            encryptedStorageManager.set(key, value, password).then(ok => {
-              if (ok) {
+            encryptedStorageManager.set(key, value, password).then(isSuccessful => {
+              if (isSuccessful) {
                 encryptedStorageManager.get(key, password).then(setPersistedValue);
               }
             });
diff --git a/web/example/src/examples/FileInputExample.tsx b/web/example/src/examples/FileInputExample.tsx
index 9d7840ab..1f082d04 100644
--- a/web/example/src/examples/FileInputExample.tsx
+++ b/web/example/src/examples/FileInputExample.tsx
@@ -29,7 +29,9 @@ export function FileInputExample() {
         <input
           type="checkbox"
           checked={multiple}
-          onChange={event => setMultiple(event.target.checked)}
+          onChange={event => {
+            setMultiple(event.target.checked);
+          }}
         />
       </p>
 
diff --git a/web/example/src/examples/GoogleSignInExample.tsx b/web/example/src/examples/GoogleSignInExample.tsx
index f4b01a3f..2b4fbc32 100644
--- a/web/example/src/examples/GoogleSignInExample.tsx
+++ b/web/example/src/examples/GoogleSignInExample.tsx
@@ -37,7 +37,9 @@ export function GoogleSignInExample() {
       </button>{' '}
       <button
         onClick={() => {
-          googleSignInManager.signOut().then(() => setAccount(null));
+          googleSignInManager.signOut().then(() => {
+            setAccount(null);
+          });
         }}
       >
         {'Sign out'}
diff --git a/web/example/src/examples/NotificationsExample.tsx b/web/example/src/examples/NotificationsExample.tsx
index 72e33f7b..f50c7c3a 100644
--- a/web/example/src/examples/NotificationsExample.tsx
+++ b/web/example/src/examples/NotificationsExample.tsx
@@ -5,12 +5,14 @@ export function NotificationsExample() {
   const [areNotificationsEnabled, setAreNotificationsEnabled] = useState(notificationsManager.areNotificationsEnabled);
 
   useEffect(() => {
-    const listener = () => setAreNotificationsEnabled(notificationsManager.areNotificationsEnabled());
+    const visibilityListener = () => {
+      setAreNotificationsEnabled(notificationsManager.areNotificationsEnabled());
+    };
 
-    window.addEventListener('visibilitychange', listener);
+    window.addEventListener('visibilitychange', visibilityListener);
 
     return () => {
-      window.removeEventListener('visibilitychange', listener);
+      window.removeEventListener('visibilitychange', visibilityListener);
     };
   }, []);
 
diff --git a/web/racehorse/src/main/createActivityManager.ts b/web/racehorse/src/main/createActivityManager.ts
index ea83c9be..846598f2 100644
--- a/web/racehorse/src/main/createActivityManager.ts
+++ b/web/racehorse/src/main/createActivityManager.ts
@@ -196,7 +196,7 @@ export function createActivityManager(eventBridge: EventBridge, uiScheduler: Sch
   return {
     getActivityState: () => eventBridge.request({ type: 'org.racehorse.GetActivityStateEvent' }).payload.state,
 
-    getActivityInfo: () => eventBridge.request({ type: 'org.racehorse.GetActivityInfoEvent' }).payload.activityInfo,
+    getActivityInfo: () => eventBridge.request({ type: 'org.racehorse.GetActivityInfoEvent' }).payload.info,
 
     startActivity: intent =>
       eventBridge.request({ type: 'org.racehorse.StartActivityEvent', payload: { intent } }).payload.isStarted,
diff --git a/web/racehorse/src/main/createBiometricEncryptedStorageManager.ts b/web/racehorse/src/main/createBiometricEncryptedStorageManager.ts
index 66f1d38d..dc5d9899 100644
--- a/web/racehorse/src/main/createBiometricEncryptedStorageManager.ts
+++ b/web/racehorse/src/main/createBiometricEncryptedStorageManager.ts
@@ -82,12 +82,12 @@ export function createBiometricEncryptedStorageManager(
       eventBridge.request({
         type: 'org.racehorse.HasBiometricEncryptedValueEvent',
         payload: { key },
-      }).payload.exists,
+      }).payload.isExisting,
 
     delete: key =>
       eventBridge.request({
         type: 'org.racehorse.DeleteBiometricEncryptedValueEvent',
         payload: { key },
-      }).payload.deleted,
+      }).payload.isDeleted,
   };
 }
diff --git a/web/racehorse/src/main/createDeviceManager.ts b/web/racehorse/src/main/createDeviceManager.ts
index fcb2c7fe..756c2d27 100644
--- a/web/racehorse/src/main/createDeviceManager.ts
+++ b/web/racehorse/src/main/createDeviceManager.ts
@@ -86,7 +86,7 @@ export function createDeviceManager(eventBridge: EventBridge): DeviceManager {
     eventBridge.request({ type: 'org.racehorse.GetPreferredLocalesEvent' }).payload.locales;
 
   return {
-    getDeviceInfo: () => eventBridge.request({ type: 'org.racehorse.GetDeviceInfoEvent' }).payload.deviceInfo,
+    getDeviceInfo: () => eventBridge.request({ type: 'org.racehorse.GetDeviceInfoEvent' }).payload.info,
 
     getPreferredLocales,
 
diff --git a/web/racehorse/src/main/createDownloadManager.ts b/web/racehorse/src/main/createDownloadManager.ts
index 2de1069c..9e911caa 100644
--- a/web/racehorse/src/main/createDownloadManager.ts
+++ b/web/racehorse/src/main/createDownloadManager.ts
@@ -262,6 +262,6 @@ export function createDownloadManager(eventBridge: EventBridge): DownloadManager
     getAllDownloads: () => eventBridge.request({ type: 'org.racehorse.GetAllDownloadsEvent' }).payload.downloads,
 
     removeDownload: id =>
-      eventBridge.request({ type: 'org.racehorse.RemoveDownloadEvent', payload: { id } }).payload.removed,
+      eventBridge.request({ type: 'org.racehorse.RemoveDownloadEvent', payload: { id } }).payload.isRemoved,
   };
 }
diff --git a/web/racehorse/src/main/createEncryptedStorageManager.ts b/web/racehorse/src/main/createEncryptedStorageManager.ts
index c6b330b6..77e60ae5 100644
--- a/web/racehorse/src/main/createEncryptedStorageManager.ts
+++ b/web/racehorse/src/main/createEncryptedStorageManager.ts
@@ -43,12 +43,16 @@ export function createEncryptedStorageManager(eventBridge: EventBridge): Encrypt
         .requestAsync({ type: 'org.racehorse.GetEncryptedValueEvent', payload: { key, password } })
         .then(event => event.payload.value),
 
-    has: key => eventBridge.request({ type: 'org.racehorse.HasEncryptedValueEvent', payload: { key } }).payload.exists,
+    has: key =>
+      eventBridge.request({
+        type: 'org.racehorse.HasEncryptedValueEvent',
+        payload: { key },
+      }).payload.isExisting,
 
     delete: key =>
       eventBridge.request({
         type: 'org.racehorse.DeleteEncryptedValueEvent',
         payload: { key },
-      }).payload.deleted,
+      }).payload.isDeleted,
   };
 }
diff --git a/web/racehorse/src/main/createGooglePayManager.ts b/web/racehorse/src/main/createGooglePayManager.ts
index 85eadd05..c2628c6a 100644
--- a/web/racehorse/src/main/createGooglePayManager.ts
+++ b/web/racehorse/src/main/createGooglePayManager.ts
@@ -329,7 +329,7 @@ export function createGooglePayManager(eventBridge: EventBridge, uiScheduler: Sc
             type: 'org.racehorse.GooglePayViewTokenEvent',
             payload: { tokenId, tokenServiceProvider },
           })
-          .then(event => event.payload.opened)
+          .then(event => event.payload.isOpened)
       ),
 
     pushTokenize: request =>
diff --git a/web/racehorse/src/main/createScheduler.ts b/web/racehorse/src/main/createScheduler.ts
index c914c7ef..e29f8f06 100644
--- a/web/racehorse/src/main/createScheduler.ts
+++ b/web/racehorse/src/main/createScheduler.ts
@@ -11,7 +11,7 @@ export interface Scheduler {
    *
    * @param operation The operation to schedule.
    */
-  schedule<T>(operation: () => Promise<T>): Promise<T>;
+  schedule<T>(operation: () => PromiseLike<T> | T): Promise<T>;
 }
 
 /**
@@ -19,24 +19,24 @@ export interface Scheduler {
  */
 export function createScheduler(): Scheduler {
   let promise: Promise<unknown> = Promise.resolve();
-  let pending = false;
+  let isPending = false;
 
   return {
-    isPending: () => pending,
+    isPending: () => isPending,
 
     schedule: operation => {
-      pending = true;
+      isPending = true;
 
       const operationPromise = promise
         .then(noop, noop)
         .then(operation)
         .then(
           result => {
-            pending = promise !== operationPromise;
+            isPending = promise !== operationPromise;
             return result;
           },
           reason => {
-            pending = promise !== operationPromise;
+            isPending = promise !== operationPromise;
             throw reason;
           }
         );