diff --git a/packages/ariakit-react-core/src/checkbox/checkbox-context.tsx b/packages/ariakit-react-core/src/checkbox/checkbox-context.tsx
index 5b1632ac2d..3cad45bc27 100644
--- a/packages/ariakit-react-core/src/checkbox/checkbox-context.tsx
+++ b/packages/ariakit-react-core/src/checkbox/checkbox-context.tsx
@@ -16,12 +16,12 @@ const ctx = createStoreContext<CheckboxStore>();
  *   // Use the store...
  * }
  */
-export const useCheckboxContext = ctx.useStoreContext;
+export const useCheckboxContext = ctx.useContext;
 
-export const useCheckboxScopedContext = ctx.useScopedStoreContext;
+export const useCheckboxScopedContext = ctx.useScopedContext;
 
-export const useCheckboxProviderContext = ctx.useStoreProviderContext;
+export const useCheckboxProviderContext = ctx.useProviderContext;
 
-export const CheckboxContextProvider = ctx.StoreContextProvider;
+export const CheckboxContextProvider = ctx.ContextProvider;
 
-export const CheckboxScopedContextProvider = ctx.StoreScopedContextProvider;
+export const CheckboxScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/collection/collection-context.tsx b/packages/ariakit-react-core/src/collection/collection-context.tsx
index ca65913c02..ecacaa108e 100644
--- a/packages/ariakit-react-core/src/collection/collection-context.tsx
+++ b/packages/ariakit-react-core/src/collection/collection-context.tsx
@@ -16,12 +16,12 @@ const ctx = createStoreContext<CollectionStore>();
  *   // Use the store...
  * }
  */
-export const useCollectionContext = ctx.useStoreContext;
+export const useCollectionContext = ctx.useContext;
 
-export const useCollectionScopedContext = ctx.useScopedStoreContext;
+export const useCollectionScopedContext = ctx.useScopedContext;
 
-export const useCollectionProviderContext = ctx.useStoreProviderContext;
+export const useCollectionProviderContext = ctx.useProviderContext;
 
-export const CollectionContextProvider = ctx.StoreContextProvider;
+export const CollectionContextProvider = ctx.ContextProvider;
 
-export const CollectionScopedContextProvider = ctx.StoreScopedContextProvider;
+export const CollectionScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/combobox/combobox-context.tsx b/packages/ariakit-react-core/src/combobox/combobox-context.tsx
index 57f6d62fde..299b84ff4d 100644
--- a/packages/ariakit-react-core/src/combobox/combobox-context.tsx
+++ b/packages/ariakit-react-core/src/combobox/combobox-context.tsx
@@ -28,15 +28,15 @@ const ctx = createStoreContext<ComboboxStore>(
  *   // Use the store...
  * }
  */
-export const useComboboxContext = ctx.useStoreContext;
+export const useComboboxContext = ctx.useContext;
 
-export const useComboboxScopedContext = ctx.useScopedStoreContext;
+export const useComboboxScopedContext = ctx.useScopedContext;
 
-export const useComboboxProviderContext = ctx.useStoreProviderContext;
+export const useComboboxProviderContext = ctx.useProviderContext;
 
-export const ComboboxContextProvider = ctx.StoreContextProvider;
+export const ComboboxContextProvider = ctx.ContextProvider;
 
-export const ComboboxScopedContextProvider = ctx.StoreScopedContextProvider;
+export const ComboboxScopedContextProvider = ctx.ScopedContextProvider;
 
 export const ComboboxItemValueContext = createContext<string | undefined>(
   undefined,
diff --git a/packages/ariakit-react-core/src/composite/composite-context.tsx b/packages/ariakit-react-core/src/composite/composite-context.tsx
index 3783042368..244c59fe19 100644
--- a/packages/ariakit-react-core/src/composite/composite-context.tsx
+++ b/packages/ariakit-react-core/src/composite/composite-context.tsx
@@ -24,15 +24,15 @@ const ctx = createStoreContext<CompositeStore>(
  *   // Use the store...
  * }
  */
-export const useCompositeContext = ctx.useStoreContext;
+export const useCompositeContext = ctx.useContext;
 
-export const useCompositeScopedContext = ctx.useScopedStoreContext;
+export const useCompositeScopedContext = ctx.useScopedContext;
 
-export const useCompositeProviderContext = ctx.useStoreProviderContext;
+export const useCompositeProviderContext = ctx.useProviderContext;
 
-export const CompositeContextProvider = ctx.StoreContextProvider;
+export const CompositeContextProvider = ctx.ContextProvider;
 
-export const CompositeScopedContextProvider = ctx.StoreScopedContextProvider;
+export const CompositeScopedContextProvider = ctx.ScopedContextProvider;
 
 interface ItemContext {
   baseElement?: HTMLElement;
diff --git a/packages/ariakit-react-core/src/dialog/dialog-context.tsx b/packages/ariakit-react-core/src/dialog/dialog-context.tsx
index 6671468e48..5fb7513656 100644
--- a/packages/ariakit-react-core/src/dialog/dialog-context.tsx
+++ b/packages/ariakit-react-core/src/dialog/dialog-context.tsx
@@ -25,15 +25,15 @@ const ctx = createStoreContext<DialogStore>(
  *   // Use the store...
  * }
  */
-export const useDialogContext = ctx.useStoreContext;
+export const useDialogContext = ctx.useContext;
 
-export const useDialogScopedContext = ctx.useScopedStoreContext;
+export const useDialogScopedContext = ctx.useScopedContext;
 
-export const useDialogProviderContext = ctx.useStoreProviderContext;
+export const useDialogProviderContext = ctx.useProviderContext;
 
-export const DialogContextProvider = ctx.StoreContextProvider;
+export const DialogContextProvider = ctx.ContextProvider;
 
-export const DialogScopedContextProvider = ctx.StoreScopedContextProvider;
+export const DialogScopedContextProvider = ctx.ScopedContextProvider;
 
 export const DialogHeadingContext = createContext<
   SetState<string | undefined> | undefined
diff --git a/packages/ariakit-react-core/src/disclosure/disclosure-context.tsx b/packages/ariakit-react-core/src/disclosure/disclosure-context.tsx
index 0e389b091c..316f7bd148 100644
--- a/packages/ariakit-react-core/src/disclosure/disclosure-context.tsx
+++ b/packages/ariakit-react-core/src/disclosure/disclosure-context.tsx
@@ -16,12 +16,12 @@ const ctx = createStoreContext<DisclosureStore>();
  *   // Use the store...
  * }
  */
-export const useDisclosureContext = ctx.useStoreContext;
+export const useDisclosureContext = ctx.useContext;
 
-export const useDisclosureScopedContext = ctx.useScopedStoreContext;
+export const useDisclosureScopedContext = ctx.useScopedContext;
 
-export const useDisclosureProviderContext = ctx.useStoreProviderContext;
+export const useDisclosureProviderContext = ctx.useProviderContext;
 
-export const DisclosureContextProvider = ctx.StoreContextProvider;
+export const DisclosureContextProvider = ctx.ContextProvider;
 
-export const DisclosureScopedContextProvider = ctx.StoreScopedContextProvider;
+export const DisclosureScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/form/form-context.tsx b/packages/ariakit-react-core/src/form/form-context.tsx
index 2785676aef..4a3e9066b8 100644
--- a/packages/ariakit-react-core/src/form/form-context.tsx
+++ b/packages/ariakit-react-core/src/form/form-context.tsx
@@ -23,12 +23,12 @@ const ctx = createStoreContext<FormStore>(
  *   // Use the store...
  * }
  */
-export const useFormContext = ctx.useStoreContext;
+export const useFormContext = ctx.useContext;
 
-export const useFormScopedContext = ctx.useScopedStoreContext;
+export const useFormScopedContext = ctx.useScopedContext;
 
-export const useFormProviderContext = ctx.useStoreProviderContext;
+export const useFormProviderContext = ctx.useProviderContext;
 
-export const FormContextProvider = ctx.StoreContextProvider;
+export const FormContextProvider = ctx.ContextProvider;
 
-export const FormScopedContextProvider = ctx.StoreScopedContextProvider;
+export const FormScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/hovercard/hovercard-context.tsx b/packages/ariakit-react-core/src/hovercard/hovercard-context.tsx
index af72a4358c..d4fbe33412 100644
--- a/packages/ariakit-react-core/src/hovercard/hovercard-context.tsx
+++ b/packages/ariakit-react-core/src/hovercard/hovercard-context.tsx
@@ -23,12 +23,12 @@ const ctx = createStoreContext<HovercardStore>(
  *   // Use the store...
  * }
  */
-export const useHovercardContext = ctx.useStoreContext;
+export const useHovercardContext = ctx.useContext;
 
-export const useHovercardScopedContext = ctx.useScopedStoreContext;
+export const useHovercardScopedContext = ctx.useScopedContext;
 
-export const useHovercardProviderContext = ctx.useStoreProviderContext;
+export const useHovercardProviderContext = ctx.useProviderContext;
 
-export const HovercardContextProvider = ctx.StoreContextProvider;
+export const HovercardContextProvider = ctx.ContextProvider;
 
-export const HovercardScopedContextProvider = ctx.StoreScopedContextProvider;
+export const HovercardScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/menu/menu-context.ts b/packages/ariakit-react-core/src/menu/menu-context.ts
index 6adfa7f4f0..6c14b92316 100644
--- a/packages/ariakit-react-core/src/menu/menu-context.ts
+++ b/packages/ariakit-react-core/src/menu/menu-context.ts
@@ -29,15 +29,15 @@ const menu = createStoreContext<MenuStore>(
  *   // Use the store...
  * }
  */
-export const useMenuContext = menu.useStoreContext;
+export const useMenuContext = menu.useContext;
 
-export const useMenuScopedContext = menu.useScopedStoreContext;
+export const useMenuScopedContext = menu.useScopedContext;
 
-export const useMenuProviderContext = menu.useStoreProviderContext;
+export const useMenuProviderContext = menu.useProviderContext;
 
-export const MenuContextProvider = menu.StoreContextProvider;
+export const MenuContextProvider = menu.ContextProvider;
 
-export const MenuScopedContextProvider = menu.StoreScopedContextProvider;
+export const MenuScopedContextProvider = menu.ScopedContextProvider;
 
 const menubar = createStoreContext<MenuBarStore>(
   [CompositeContextProvider],
@@ -57,15 +57,15 @@ const menubar = createStoreContext<MenuBarStore>(
  *   // Use the store...
  * }
  */
-export const useMenuBarContext = menubar.useStoreContext;
+export const useMenuBarContext = menubar.useContext;
 
-export const useMenuBarScopedContext = menubar.useScopedStoreContext;
+export const useMenuBarScopedContext = menubar.useScopedContext;
 
-export const useMenuBarProviderContext = menubar.useStoreProviderContext;
+export const useMenuBarProviderContext = menubar.useProviderContext;
 
-export const MenuBarContextProvider = menubar.StoreContextProvider;
+export const MenuBarContextProvider = menubar.ContextProvider;
 
-export const MenuBarScopedContextProvider = menubar.StoreScopedContextProvider;
+export const MenuBarScopedContextProvider = menubar.ScopedContextProvider;
 
 export const MenuItemCheckedContext = createContext<boolean | undefined>(
   undefined,
diff --git a/packages/ariakit-react-core/src/popover/popover-context.tsx b/packages/ariakit-react-core/src/popover/popover-context.tsx
index 0409f24d2d..f73fc1d857 100644
--- a/packages/ariakit-react-core/src/popover/popover-context.tsx
+++ b/packages/ariakit-react-core/src/popover/popover-context.tsx
@@ -23,12 +23,12 @@ const ctx = createStoreContext<PopoverStore>(
  *   // Use the store...
  * }
  */
-export const usePopoverContext = ctx.useStoreContext;
+export const usePopoverContext = ctx.useContext;
 
-export const usePopoverScopedContext = ctx.useScopedStoreContext;
+export const usePopoverScopedContext = ctx.useScopedContext;
 
-export const usePopoverProviderContext = ctx.useStoreProviderContext;
+export const usePopoverProviderContext = ctx.useProviderContext;
 
-export const PopoverContextProvider = ctx.StoreContextProvider;
+export const PopoverContextProvider = ctx.ContextProvider;
 
-export const PopoverScopedContextProvider = ctx.StoreScopedContextProvider;
+export const PopoverScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/radio/radio-context.tsx b/packages/ariakit-react-core/src/radio/radio-context.tsx
index 19c751d7b9..5365c20b88 100644
--- a/packages/ariakit-react-core/src/radio/radio-context.tsx
+++ b/packages/ariakit-react-core/src/radio/radio-context.tsx
@@ -23,12 +23,12 @@ const ctx = createStoreContext<RadioStore>(
  *   // Use the store...
  * }
  */
-export const useRadioContext = ctx.useStoreContext;
+export const useRadioContext = ctx.useContext;
 
-export const useRadioScopedContext = ctx.useScopedStoreContext;
+export const useRadioScopedContext = ctx.useScopedContext;
 
-export const useRadioProviderContext = ctx.useStoreProviderContext;
+export const useRadioProviderContext = ctx.useProviderContext;
 
-export const RadioContextProvider = ctx.StoreContextProvider;
+export const RadioContextProvider = ctx.ContextProvider;
 
-export const RadioScopedContextProvider = ctx.StoreScopedContextProvider;
+export const RadioScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/select/select-context.tsx b/packages/ariakit-react-core/src/select/select-context.tsx
index e56a6cd853..7231a4abb4 100644
--- a/packages/ariakit-react-core/src/select/select-context.tsx
+++ b/packages/ariakit-react-core/src/select/select-context.tsx
@@ -28,14 +28,14 @@ const ctx = createStoreContext<SelectStore>(
  *   // Use the store...
  * }
  */
-export const useSelectContext = ctx.useStoreContext;
+export const useSelectContext = ctx.useContext;
 
-export const useSelectScopedContext = ctx.useScopedStoreContext;
+export const useSelectScopedContext = ctx.useScopedContext;
 
-export const useSelectProviderContext = ctx.useStoreProviderContext;
+export const useSelectProviderContext = ctx.useProviderContext;
 
-export const SelectContextProvider = ctx.StoreContextProvider;
+export const SelectContextProvider = ctx.ContextProvider;
 
-export const SelectScopedContextProvider = ctx.StoreScopedContextProvider;
+export const SelectScopedContextProvider = ctx.ScopedContextProvider;
 
 export const SelectItemCheckedContext = createContext(false);
diff --git a/packages/ariakit-react-core/src/tab/tab-context.tsx b/packages/ariakit-react-core/src/tab/tab-context.tsx
index 2754eb189d..830ef458c5 100644
--- a/packages/ariakit-react-core/src/tab/tab-context.tsx
+++ b/packages/ariakit-react-core/src/tab/tab-context.tsx
@@ -23,12 +23,12 @@ const ctx = createStoreContext<TabStore>(
  *   // Use the store...
  * }
  */
-export const useTabContext = ctx.useStoreContext;
+export const useTabContext = ctx.useContext;
 
-export const useTabScopedContext = ctx.useScopedStoreContext;
+export const useTabScopedContext = ctx.useScopedContext;
 
-export const useTabProviderContext = ctx.useStoreProviderContext;
+export const useTabProviderContext = ctx.useProviderContext;
 
-export const TabContextProvider = ctx.StoreContextProvider;
+export const TabContextProvider = ctx.ContextProvider;
 
-export const TabScopedContextProvider = ctx.StoreScopedContextProvider;
+export const TabScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/toolbar/toolbar-context.tsx b/packages/ariakit-react-core/src/toolbar/toolbar-context.tsx
index ead80e5a97..e6b1de5d21 100644
--- a/packages/ariakit-react-core/src/toolbar/toolbar-context.tsx
+++ b/packages/ariakit-react-core/src/toolbar/toolbar-context.tsx
@@ -23,12 +23,12 @@ const ctx = createStoreContext<ToolbarStore>(
  *   // Use the store...
  * }
  */
-export const useToolbarContext = ctx.useStoreContext;
+export const useToolbarContext = ctx.useContext;
 
-export const useToolbarScopedContext = ctx.useScopedStoreContext;
+export const useToolbarScopedContext = ctx.useScopedContext;
 
-export const useToolbarProviderContext = ctx.useStoreProviderContext;
+export const useToolbarProviderContext = ctx.useProviderContext;
 
-export const ToolbarContextProvider = ctx.StoreContextProvider;
+export const ToolbarContextProvider = ctx.ContextProvider;
 
-export const ToolbarScopedContextProvider = ctx.StoreScopedContextProvider;
+export const ToolbarScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/tooltip/tooltip-context.tsx b/packages/ariakit-react-core/src/tooltip/tooltip-context.tsx
index 60fff22799..b2f6765fb3 100644
--- a/packages/ariakit-react-core/src/tooltip/tooltip-context.tsx
+++ b/packages/ariakit-react-core/src/tooltip/tooltip-context.tsx
@@ -23,12 +23,12 @@ const ctx = createStoreContext<TooltipStore>(
  *   // Use the store...
  * }
  */
-export const useTooltipContext = ctx.useStoreContext;
+export const useTooltipContext = ctx.useContext;
 
-export const useTooltipScopedContext = ctx.useScopedStoreContext;
+export const useTooltipScopedContext = ctx.useScopedContext;
 
-export const useTooltipProviderContext = ctx.useStoreProviderContext;
+export const useTooltipProviderContext = ctx.useProviderContext;
 
-export const TooltipContextProvider = ctx.StoreContextProvider;
+export const TooltipContextProvider = ctx.ContextProvider;
 
-export const TooltipScopedContextProvider = ctx.StoreScopedContextProvider;
+export const TooltipScopedContextProvider = ctx.ScopedContextProvider;
diff --git a/packages/ariakit-react-core/src/utils/system.tsx b/packages/ariakit-react-core/src/utils/system.tsx
index 93e609f005..69d91345c1 100644
--- a/packages/ariakit-react-core/src/utils/system.tsx
+++ b/packages/ariakit-react-core/src/utils/system.tsx
@@ -201,23 +201,23 @@ export function createStoreContext<T extends Store>(
   const context = React.createContext<T | undefined>(undefined);
   const scopedContext = React.createContext<T | undefined>(undefined);
 
-  const useStoreContext = () => React.useContext(context);
+  const useContext = () => React.useContext(context);
 
-  const useScopedStoreContext = (onlyScoped = false) => {
+  const useScopedContext = (onlyScoped = false) => {
     const scoped = React.useContext(scopedContext);
-    const store = useStoreContext();
+    const store = useContext();
     if (onlyScoped) return scoped;
     return scoped || store;
   };
 
-  const useStoreProviderContext = () => {
+  const useProviderContext = () => {
     const scoped = React.useContext(scopedContext);
-    const store = useStoreContext();
+    const store = useContext();
     if (scoped && scoped === store) return;
     return store;
   };
 
-  const StoreContextProvider = (
+  const ContextProvider = (
     props: React.ComponentPropsWithoutRef<typeof context.Provider>,
   ) => {
     return providers.reduceRight(
@@ -226,28 +226,28 @@ export function createStoreContext<T extends Store>(
     );
   };
 
-  const StoreScopedContextProvider = (
+  const ScopedContextProvider = (
     props: React.ComponentPropsWithoutRef<typeof scopedContext.Provider>,
   ) => {
     return (
-      <StoreContextProvider {...props}>
+      <ContextProvider {...props}>
         {scopedProviders.reduceRight(
           (children, Provider) => (
             <Provider {...props}>{children}</Provider>
           ),
           <scopedContext.Provider {...props} />,
         )}
-      </StoreContextProvider>
+      </ContextProvider>
     );
   };
 
   return {
     context,
     scopedContext,
-    useStoreContext,
-    useScopedStoreContext,
-    useStoreProviderContext,
-    StoreContextProvider,
-    StoreScopedContextProvider,
+    useContext,
+    useScopedContext,
+    useProviderContext,
+    ContextProvider,
+    ScopedContextProvider,
   };
 }