diff --git a/src/context.ts b/src/context.ts
index fe0d9412db..f27260b032 100644
--- a/src/context.ts
+++ b/src/context.ts
@@ -95,10 +95,24 @@ function createContext<
     )
   }
 
+  let didWarnAboutStoreApiDeprecation = false
+
   return {
     Provider,
     useStore,
-    useStoreApi,
+    /**
+     * @deprecated `useStoreApi` is renamed to `useStoreRef`, `useStoreApi` will be removed in next major
+     */
+    useStoreApi: (...a: Parameters<typeof useStoreApi>) => {
+      if (!didWarnAboutStoreApiDeprecation) {
+        console.warn(
+          '`useStoreApi` is renamed to `useStoreRef`, `useStoreApi` will be removed in next major'
+        )
+        didWarnAboutStoreApiDeprecation = true
+      }
+      return useStoreApi(...a)
+    },
+    useStoreRef: useStoreApi,
   }
 }
 
diff --git a/src/middleware/devtools.ts b/src/middleware/devtools.ts
index bd69eac0a8..db35626c8e 100644
--- a/src/middleware/devtools.ts
+++ b/src/middleware/devtools.ts
@@ -41,37 +41,92 @@ export type StoreApiWithDevtools<T extends State> = StoreApi<T> & {
   devtools?: DevtoolsType
 }
 
-export const devtools =
-  <
-    S extends State,
-    CustomSetState extends SetState<S>,
-    CustomGetState extends GetState<S>,
-    CustomStoreApi extends StoreApi<S>
-  >(
-    fn: (set: NamedSet<S>, get: CustomGetState, api: CustomStoreApi) => S,
-    options?:
-      | string
-      | {
-          name?: string
-          anonymousActionType?: string
-          serialize?: {
-            options:
-              | boolean
-              | {
-                  date?: boolean
-                  regex?: boolean
-                  undefined?: boolean
-                  nan?: boolean
-                  infinity?: boolean
-                  error?: boolean
-                  symbol?: boolean
-                  map?: boolean
-                  set?: boolean
-                }
+/**
+ * @deprecated Passing `name` as directly will be not allowed in next major.
+ * Pass the `name` in an object `{ name: ... }` instead
+ */
+export function devtools<
+  S extends State,
+  CustomSetState extends SetState<S>,
+  CustomGetState extends GetState<S>,
+  CustomStoreApi extends StoreApi<S>
+>(
+  fn: (set: NamedSet<S>, get: CustomGetState, api: CustomStoreApi) => S,
+  options?: string
+): (
+  set: CustomSetState,
+  get: CustomGetState,
+  api: CustomStoreApi &
+    StoreApiWithDevtools<S> & {
+      dispatch?: unknown
+      dispatchFromDevtools?: boolean
+    }
+) => S
+export function devtools<
+  S extends State,
+  CustomSetState extends SetState<S>,
+  CustomGetState extends GetState<S>,
+  CustomStoreApi extends StoreApi<S>
+>(
+  fn: (set: NamedSet<S>, get: CustomGetState, api: CustomStoreApi) => S,
+  options?: {
+    name?: string
+    anonymousActionType?: string
+    serialize?: {
+      options:
+        | boolean
+        | {
+            date?: boolean
+            regex?: boolean
+            undefined?: boolean
+            nan?: boolean
+            infinity?: boolean
+            error?: boolean
+            symbol?: boolean
+            map?: boolean
+            set?: boolean
           }
+    }
+  }
+): (
+  set: CustomSetState,
+  get: CustomGetState,
+  api: CustomStoreApi &
+    StoreApiWithDevtools<S> & {
+      dispatch?: unknown
+      dispatchFromDevtools?: boolean
+    }
+) => S
+export function devtools<
+  S extends State,
+  CustomSetState extends SetState<S>,
+  CustomGetState extends GetState<S>,
+  CustomStoreApi extends StoreApi<S>
+>(
+  fn: (set: NamedSet<S>, get: CustomGetState, api: CustomStoreApi) => S,
+  options?:
+    | string
+    | {
+        name?: string
+        anonymousActionType?: string
+        serialize?: {
+          options:
+            | boolean
+            | {
+                date?: boolean
+                regex?: boolean
+                undefined?: boolean
+                nan?: boolean
+                infinity?: boolean
+                error?: boolean
+                symbol?: boolean
+                map?: boolean
+                set?: boolean
+              }
         }
-  ) =>
-  (
+      }
+) {
+  return (
     set: CustomSetState,
     get: CustomGetState,
     api: CustomStoreApi &
@@ -80,6 +135,14 @@ export const devtools =
         dispatchFromDevtools?: boolean
       }
   ): S => {
+    let didWarnAboutNameDeprecation = false
+    if (typeof options === 'string' && !didWarnAboutNameDeprecation) {
+      console.warn(
+        '[zustand devtools middleware]: passing `name` as directly will be not allowed in next major' +
+          'pass the `name` in an object `{ name: ... }` instead'
+      )
+      didWarnAboutNameDeprecation = true
+    }
     const devtoolsOptions =
       options === undefined
         ? { name: undefined, anonymousActionType: undefined }
@@ -262,6 +325,7 @@ export const devtools =
 
     return initialState
   }
+}
 
 const parseJsonThen = <T>(stringified: string, f: (parsed: T) => void) => {
   let parsed: T | undefined
diff --git a/src/vanilla.ts b/src/vanilla.ts
index 027a66f553..9396fca67d 100644
--- a/src/vanilla.ts
+++ b/src/vanilla.ts
@@ -1,6 +1,18 @@
+/**
+ * @deprecated `State` is renamed to `UnknownState`,
+ * `State` will be removed in next major
+ */
 export type State = object
+
+export type UnknownState = object
+
 // types inspired by setState from React, see:
 // https://github.com/DefinitelyTyped/DefinitelyTyped/blob/6c49e45842358ba59a508e13130791989911430d/types/react/v16/index.d.ts#L489-L495
+/**
+ * @deprecated Use the builtin `Partial<T>` instead of `PartialState<T>`.
+ * Additionally turn on `--exactOptionalPropertyTypes` tsc flag.
+ * `PartialState` will be removed in next major
+ */
 export type PartialState<
   T extends State,
   K1 extends keyof T = keyof T,
@@ -10,10 +22,35 @@ export type PartialState<
 > =
   | (Pick<T, K1> | Pick<T, K2> | Pick<T, K3> | Pick<T, K4> | T)
   | ((state: T) => Pick<T, K1> | Pick<T, K2> | Pick<T, K3> | Pick<T, K4> | T)
+
+/**
+ * @deprecated Use `(t: T) => U` instead of `StateSelector<T, U>`.
+ * `StateSelector` will be removed in next major.
+ */
 export type StateSelector<T extends State, U> = (state: T) => U
+
+/**
+ * @deprecated Use `(a: T, b: T) => boolean` instead of `EqualityChecker<T>.
+ * `EqualityChecker` will be removed in next major.
+ */
 export type EqualityChecker<T> = (state: T, newState: T) => boolean
+
+/**
+ * @deprecated Use `(state: T, prevState: T) => void` instead of `StateListener<T>`.
+ * `StateListener` will be removed in next major.
+ */
 export type StateListener<T> = (state: T, previousState: T) => void
+
+/**
+ * @deprecated Use `(slice: T, prevSlice: T) => void` instead of `StateSliceListener<T>`.
+ * `StateSliceListener` will be removed in next major.
+ */
 export type StateSliceListener<T> = (slice: T, previousSlice: T) => void
+
+/**
+ * @deprecated Use `Store<T>['subscribe']` instead of `Subscribe<T>`.
+ * `Subscribe` will be removed in next major.
+ */
 export type Subscribe<T extends State> = {
   (listener: StateListener<T>): () => void
   /**
@@ -26,6 +63,10 @@ export type Subscribe<T extends State> = {
   ): () => void
 }
 
+/**
+ * @deprecated Use `Store<T>['setState']` instead of `SetState<T>`
+ * `SetState` will be removed in next major.
+ */
 export type SetState<T extends State> = {
   <
     K1 extends keyof T,
@@ -37,14 +78,41 @@ export type SetState<T extends State> = {
     replace?: boolean
   ): void
 }
+
+/**
+ * @deprecated Use `() => T` or `Store<T>['getState']` instead of `GetState<T>`
+ * `GetState` will be removed in next major.
+ */
 export type GetState<T extends State> = () => T
+
+/**
+ * @deprecated Use `() => void` or `Store<UnknownState>['destroy']` instead of `Destroy`.
+ * `Destroy` will be removed in next major.
+ */
 export type Destroy = () => void
+
+/**
+ * @deprecated `StoreApi<T>` has been renamed to `Store<T>`
+ * `StoreApi` will be removed in next major.
+ */
 export type StoreApi<T extends State> = {
   setState: SetState<T>
   getState: GetState<T>
   subscribe: Subscribe<T>
   destroy: Destroy
 }
+
+export type Store<T extends State> = {
+  setState: SetState<T>
+  getState: GetState<T>
+  subscribe: Subscribe<T>
+  destroy: Destroy
+}
+
+/**
+ * @deprecated `StateCreator` has been renamed to `StoreInitializer`.
+ * `StateCreator` will be removed in next major.
+ */
 export type StateCreator<
   T extends State,
   CustomSetState = SetState<T>,
@@ -52,6 +120,13 @@ export type StateCreator<
   CustomStoreApi extends StoreApi<T> = StoreApi<T>
 > = (set: CustomSetState, get: CustomGetState, api: CustomStoreApi) => T
 
+export type StoreInitializer<
+  T extends State,
+  CustomSetState = SetState<T>,
+  CustomGetState = GetState<T>,
+  CustomStoreApi extends StoreApi<T> = StoreApi<T>
+> = (set: CustomSetState, get: CustomGetState, api: CustomStoreApi) => T
+
 function createStore<
   TState extends State,
   CustomSetState,