diff --git a/packages/libro-common/package.json b/packages/libro-common/package.json
index 53e59e15..8e74edf0 100644
--- a/packages/libro-common/package.json
+++ b/packages/libro-common/package.json
@@ -25,9 +25,9 @@
       "typings": "./es/l10n/index.js",
       "default": "./es/l10n/index.js"
     },
-    "./mana-syringe": {
-      "typings": "./es/mana-syringe/index.js",
-      "default": "./es/mana-syringe/index.js"
+    "./ioc": {
+      "typings": "./es/ioc/index.js",
+      "default": "./es/ioc/index.js"
     },
     "./mana-observable": {
       "typings": "./es/mana-observable/index.js",
diff --git a/packages/libro-common/src/mana-syringe/container-api.ts b/packages/libro-common/src/ioc/container-api.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/container-api.ts
rename to packages/libro-common/src/ioc/container-api.ts
diff --git a/packages/libro-common/src/mana-syringe/container.spec.ts b/packages/libro-common/src/ioc/container.spec.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/container.spec.ts
rename to packages/libro-common/src/ioc/container.spec.ts
diff --git a/packages/libro-common/src/mana-syringe/container.ts b/packages/libro-common/src/ioc/container.ts
similarity index 95%
rename from packages/libro-common/src/mana-syringe/container.ts
rename to packages/libro-common/src/ioc/container.ts
index 8f65a661..16367a82 100644
--- a/packages/libro-common/src/mana-syringe/container.ts
+++ b/packages/libro-common/src/ioc/container.ts
@@ -4,17 +4,17 @@ import { Container as InversifyContainer } from 'inversify';
 import type { Disposable } from '../common/index.js';
 import { DisposableCollection, Emitter } from '../common/index.js';
 
-import { ContainerAPI } from './container-api';
-import { Syringe } from './core';
-import { Utils } from './core';
+import { ContainerAPI } from './container-api.js';
+import { Syringe } from './core.js';
+import { Utils } from './core.js';
 import {
   GlobalContainer as InversifyGlobalContainer,
   namedToIdentifier,
   tokenToIdentifier,
-} from './inversify-api';
-import type { InversifyContext } from './inversify-api/inversify-protocol';
-import { isSyringeModule } from './module';
-import { Register } from './register';
+} from './inversify-api/index.js';
+import type { InversifyContext } from './inversify-api/inversify-protocol.js';
+import { isSyringeModule } from './module/index.js';
+import { Register } from './register.js';
 
 export const ContainerMeta = Symbol('ContainerMeta');
 
diff --git a/packages/libro-common/src/mana-syringe/contribution/contribution-protocol.ts b/packages/libro-common/src/ioc/contribution/contribution-protocol.ts
similarity index 93%
rename from packages/libro-common/src/mana-syringe/contribution/contribution-protocol.ts
rename to packages/libro-common/src/ioc/contribution/contribution-protocol.ts
index a8ab832b..2055fa12 100644
--- a/packages/libro-common/src/mana-syringe/contribution/contribution-protocol.ts
+++ b/packages/libro-common/src/ioc/contribution/contribution-protocol.ts
@@ -1,5 +1,5 @@
 import type { Event } from '../../common/index.js';
-import { Syringe } from '../core';
+import { Syringe } from '../core.js';
 
 export type Option = {
   /**
diff --git a/packages/libro-common/src/mana-syringe/contribution/contribution-provider.ts b/packages/libro-common/src/ioc/contribution/contribution-provider.ts
similarity index 96%
rename from packages/libro-common/src/mana-syringe/contribution/contribution-provider.ts
rename to packages/libro-common/src/ioc/contribution/contribution-provider.ts
index 6e23c6d1..9dc0e77a 100644
--- a/packages/libro-common/src/mana-syringe/contribution/contribution-provider.ts
+++ b/packages/libro-common/src/ioc/contribution/contribution-provider.ts
@@ -1,13 +1,13 @@
 import type { Disposable } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
 import { DisposableCollection } from '../../common/index.js';
-import type { Syringe } from '../core';
+import type { Syringe } from '../core.js';
 
 import {
   ContributionOptionConfig,
   type Option,
   type Provider,
-} from './contribution-protocol';
+} from './contribution-protocol.js';
 
 export class DefaultContributionProvider<T extends Record<string, any>>
   implements Provider<T>, Disposable
diff --git a/packages/libro-common/src/mana-syringe/contribution/contribution-register.ts b/packages/libro-common/src/ioc/contribution/contribution-register.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/contribution/contribution-register.ts
rename to packages/libro-common/src/ioc/contribution/contribution-register.ts
diff --git a/packages/libro-common/src/mana-syringe/contribution/decorator.ts b/packages/libro-common/src/ioc/contribution/decorator.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/contribution/decorator.ts
rename to packages/libro-common/src/ioc/contribution/decorator.ts
diff --git a/packages/libro-common/src/mana-syringe/contribution/index.spec.ts b/packages/libro-common/src/ioc/contribution/index.spec.ts
similarity index 98%
rename from packages/libro-common/src/mana-syringe/contribution/index.spec.ts
rename to packages/libro-common/src/ioc/contribution/index.spec.ts
index 284d0949..bf4c1d97 100644
--- a/packages/libro-common/src/mana-syringe/contribution/index.spec.ts
+++ b/packages/libro-common/src/ioc/contribution/index.spec.ts
@@ -5,7 +5,7 @@ import assert from 'assert';
 
 import { GlobalContainer } from '../container';
 import { register } from '../container';
-import { Contribution, contrib } from '../contribution/index';
+import { Contribution, contrib } from './index';
 import { Syringe } from '../core';
 import { inject, singleton } from '../decorator';
 import { Module } from '../module/index';
diff --git a/packages/libro-common/src/mana-syringe/contribution/index.ts b/packages/libro-common/src/ioc/contribution/index.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/contribution/index.ts
rename to packages/libro-common/src/ioc/contribution/index.ts
diff --git a/packages/libro-common/src/mana-syringe/core.ts b/packages/libro-common/src/ioc/core.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/core.ts
rename to packages/libro-common/src/ioc/core.ts
diff --git a/packages/libro-common/src/mana-syringe/decorator.spec.ts b/packages/libro-common/src/ioc/decorator.spec.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/decorator.spec.ts
rename to packages/libro-common/src/ioc/decorator.spec.ts
diff --git a/packages/libro-common/src/mana-syringe/decorator.ts b/packages/libro-common/src/ioc/decorator.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/decorator.ts
rename to packages/libro-common/src/ioc/decorator.ts
diff --git a/packages/libro-common/src/mana-syringe/features/auto-factory.spec.ts b/packages/libro-common/src/ioc/features/auto-factory.spec.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/features/auto-factory.spec.ts
rename to packages/libro-common/src/ioc/features/auto-factory.spec.ts
diff --git a/packages/libro-common/src/mana-syringe/features/auto-factory.ts b/packages/libro-common/src/ioc/features/auto-factory.ts
similarity index 90%
rename from packages/libro-common/src/mana-syringe/features/auto-factory.ts
rename to packages/libro-common/src/ioc/features/auto-factory.ts
index 50c1e7ce..1dc1c9d8 100644
--- a/packages/libro-common/src/mana-syringe/features/auto-factory.ts
+++ b/packages/libro-common/src/ioc/features/auto-factory.ts
@@ -1,7 +1,7 @@
 import type { Newable } from '../../common/index.js';
-import { Syringe } from '../core';
-import { transient } from '../decorator';
-import { registerSideOption } from '../side-option';
+import { Syringe } from '../core.js';
+import { transient } from '../decorator.js';
+import { registerSideOption } from '../side-option.js';
 
 export const AutoFactoryOption = Syringe.defineToken('AutoFactoryOption');
 export const AutoFactoryMeta = Syringe.defineToken('AutoFactoryMeta', {
diff --git a/packages/libro-common/src/mana-syringe/features/prioritized-contribution.ts b/packages/libro-common/src/ioc/features/prioritized-contribution.ts
similarity index 89%
rename from packages/libro-common/src/mana-syringe/features/prioritized-contribution.ts
rename to packages/libro-common/src/ioc/features/prioritized-contribution.ts
index 1cb8e560..f71a77c1 100644
--- a/packages/libro-common/src/mana-syringe/features/prioritized-contribution.ts
+++ b/packages/libro-common/src/ioc/features/prioritized-contribution.ts
@@ -1,9 +1,9 @@
 import { Priority } from '../../common/index.js';
 import type { Newable } from '../../common/index.js';
 import type { Contribution } from '../contribution/index';
-import { Syringe } from '../core';
-import { singleton } from '../decorator';
-import { registerSideOption } from '../side-option';
+import { Syringe } from '../core.js';
+import { singleton } from '../decorator.js';
+import { registerSideOption } from '../side-option.js';
 
 export interface PrioritizedContribution<O = any, T = any> {
   canHandle: (option: O) => number;
diff --git a/packages/libro-common/src/mana-syringe/index.ts b/packages/libro-common/src/ioc/index.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/index.ts
rename to packages/libro-common/src/ioc/index.ts
diff --git a/packages/libro-common/src/mana-syringe/inversify-api/index.spec.ts b/packages/libro-common/src/ioc/inversify-api/index.spec.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/inversify-api/index.spec.ts
rename to packages/libro-common/src/ioc/inversify-api/index.spec.ts
diff --git a/packages/libro-common/src/mana-syringe/inversify-api/index.ts b/packages/libro-common/src/ioc/inversify-api/index.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/inversify-api/index.ts
rename to packages/libro-common/src/ioc/inversify-api/index.ts
diff --git a/packages/libro-common/src/mana-syringe/inversify-api/inversify-protocol.ts b/packages/libro-common/src/ioc/inversify-api/inversify-protocol.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/inversify-api/inversify-protocol.ts
rename to packages/libro-common/src/ioc/inversify-api/inversify-protocol.ts
diff --git a/packages/libro-common/src/mana-syringe/module/index.spec.ts b/packages/libro-common/src/ioc/module/index.spec.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/module/index.spec.ts
rename to packages/libro-common/src/ioc/module/index.spec.ts
diff --git a/packages/libro-common/src/mana-syringe/module/index.ts b/packages/libro-common/src/ioc/module/index.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/module/index.ts
rename to packages/libro-common/src/ioc/module/index.ts
diff --git a/packages/libro-common/src/mana-syringe/module/syringe-module.ts b/packages/libro-common/src/ioc/module/syringe-module.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/module/syringe-module.ts
rename to packages/libro-common/src/ioc/module/syringe-module.ts
diff --git a/packages/libro-common/src/mana-syringe/register.spec.ts b/packages/libro-common/src/ioc/register.spec.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/register.spec.ts
rename to packages/libro-common/src/ioc/register.spec.ts
diff --git a/packages/libro-common/src/mana-syringe/register.ts b/packages/libro-common/src/ioc/register.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/register.ts
rename to packages/libro-common/src/ioc/register.ts
diff --git a/packages/libro-common/src/mana-syringe/side-option.spec.ts b/packages/libro-common/src/ioc/side-option.spec.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/side-option.spec.ts
rename to packages/libro-common/src/ioc/side-option.spec.ts
diff --git a/packages/libro-common/src/mana-syringe/side-option.ts b/packages/libro-common/src/ioc/side-option.ts
similarity index 100%
rename from packages/libro-common/src/mana-syringe/side-option.ts
rename to packages/libro-common/src/ioc/side-option.ts
diff --git a/packages/libro-common/src/mana-app/app.tsx b/packages/libro-common/src/mana-app/app.tsx
index da39e592..a92946aa 100644
--- a/packages/libro-common/src/mana-app/app.tsx
+++ b/packages/libro-common/src/mana-app/app.tsx
@@ -1,5 +1,5 @@
 import { ApplicationContribution, localStorageService } from '../mana-core/index.js';
-import { inject, singleton } from '../mana-syringe/index.js';
+import { inject, singleton } from '../ioc/index.js';
 
 import { NotificationService } from './notification/service';
 
diff --git a/packages/libro-common/src/mana-app/file-tree/file-service.ts b/packages/libro-common/src/mana-app/file-tree/file-service.ts
index 99d0ace5..9c02ad3d 100644
--- a/packages/libro-common/src/mana-app/file-tree/file-service.ts
+++ b/packages/libro-common/src/mana-app/file-tree/file-service.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Emitter } from '../../common/index.js';
 import type { URI } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import type {
   CopyFileOptions,
diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-label-provider.ts b/packages/libro-common/src/mana-app/file-tree/file-tree-label-provider.ts
index 58e9229f..64b1d4e5 100644
--- a/packages/libro-common/src/mana-app/file-tree/file-tree-label-provider.ts
+++ b/packages/libro-common/src/mana-app/file-tree/file-tree-label-provider.ts
@@ -1,5 +1,5 @@
 import type { URI } from '../../common/index.js';
-import { singleton, inject } from '../../mana-syringe/index.js';
+import { singleton, inject } from '../../ioc/index.js';
 
 import type { DidChangeLabelEvent } from '../label';
 import { LabelProvider, LabelProviderContribution, URIIconReference } from '../label';
diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-model.ts b/packages/libro-common/src/mana-app/file-tree/file-tree-model.ts
index d6a46cb2..66086dd8 100644
--- a/packages/libro-common/src/mana-app/file-tree/file-tree-model.ts
+++ b/packages/libro-common/src/mana-app/file-tree/file-tree-model.ts
@@ -1,7 +1,7 @@
 // import { Modal } from 'antd';
 import { Deferred } from '../../common/index.js';
 import { URI } from '../../common/index.js';
-import { inject, postConstruct, singleton } from '../../mana-syringe/index.js';
+import { inject, postConstruct, singleton } from '../../ioc/index.js';
 
 import { LabelProvider } from '../label';
 import {
diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-view.tsx b/packages/libro-common/src/mana-app/file-tree/file-tree-view.tsx
index c3b22729..8e9a599b 100644
--- a/packages/libro-common/src/mana-app/file-tree/file-tree-view.tsx
+++ b/packages/libro-common/src/mana-app/file-tree/file-tree-view.tsx
@@ -10,7 +10,7 @@ import { ManaModule, SelectionService, view } from '../../mana-core/index.js';
 import { ViewInstance } from '../../mana-core/index.js';
 import type { MenuPath } from '../../mana-core/index.js';
 import { useInject } from '../../mana-observable/index.js';
-import { singleton, inject } from '../../mana-syringe/index.js';
+import { singleton, inject } from '../../ioc/index.js';
 import { LabelProvider } from '../label';
 import { TreeModel } from '../tree';
 import { CompositeTreeNode, TreeNode } from '../tree/tree';
diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree.ts b/packages/libro-common/src/mana-app/file-tree/file-tree.ts
index cd07de23..d22774bb 100644
--- a/packages/libro-common/src/mana-app/file-tree/file-tree.ts
+++ b/packages/libro-common/src/mana-app/file-tree/file-tree.ts
@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import type { URI } from '../../common/index.js';
 import { getOrigin } from '../../mana-observable/index.js';
-import { inject, singleton } from '../../mana-syringe/index.js';
+import { inject, singleton } from '../../ioc/index.js';
 
 import type { TreeNode, CompositeTreeNode } from '../tree/tree';
 import { Tree } from '../tree/tree';
diff --git a/packages/libro-common/src/mana-app/index.ts b/packages/libro-common/src/mana-app/index.ts
index 9f4c4d23..cbc3b1b6 100644
--- a/packages/libro-common/src/mana-app/index.ts
+++ b/packages/libro-common/src/mana-app/index.ts
@@ -31,7 +31,7 @@ export const ManaAppPreset = ManaModule.create()
     NotificationModule,
   );
 
-export * from '../mana-syringe/index.js';
+export * from '../ioc/index.js';
 export * from '../mana-observable/index.js';
 export * from '../common/index.js';
 export * from '../mana-core/index.js';
diff --git a/packages/libro-common/src/mana-app/label/label-provider.tsx b/packages/libro-common/src/mana-app/label/label-provider.tsx
index 6ce02515..8c4fd709 100644
--- a/packages/libro-common/src/mana-app/label/label-provider.tsx
+++ b/packages/libro-common/src/mana-app/label/label-provider.tsx
@@ -2,13 +2,8 @@ import type { Event } from '../../common/index.js';
 import { URI, Priority } from '../../common/index.js';
 import { Emitter, Disposable } from '../../common/index.js';
 import { ApplicationContribution } from '../../mana-core/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import {
-  contrib,
-  postConstruct,
-  singleton,
-  Syringe,
-} from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, postConstruct, singleton, Syringe } from '../../ioc/index.js';
 import fileIcons from 'file-icons-js';
 
 export type ResourceLabelFormatter = {
diff --git a/packages/libro-common/src/mana-app/menu/menu-color-registry.ts b/packages/libro-common/src/mana-app/menu/menu-color-registry.ts
index 1181f345..7938bfc4 100644
--- a/packages/libro-common/src/mana-app/menu/menu-color-registry.ts
+++ b/packages/libro-common/src/mana-app/menu/menu-color-registry.ts
@@ -1,7 +1,7 @@
 import type { ColorRegistry } from '../../mana-core/index.js';
 import { Color } from '../../mana-core/index.js';
 import { ColorContribution } from '../../mana-core/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 @singleton({ contrib: ColorContribution })
 export class MenuColorRegistry implements ColorContribution {
diff --git a/packages/libro-common/src/mana-app/menu/menu-render.tsx b/packages/libro-common/src/mana-app/menu/menu-render.tsx
index ae91ca0e..eeb06655 100644
--- a/packages/libro-common/src/mana-app/menu/menu-render.tsx
+++ b/packages/libro-common/src/mana-app/menu/menu-render.tsx
@@ -1,6 +1,6 @@
 import type { MenuPath } from '../../mana-core/index.js';
 import { useInject, ObservableContext } from '../../mana-observable/index.js';
-import type { Syringe } from '../../mana-syringe/index.js';
+import type { Syringe } from '../../ioc/index.js';
 import type { FC } from 'react';
 import { memo, useEffect, useState, useContext, useMemo } from 'react';
 
diff --git a/packages/libro-common/src/mana-app/menu/menu.tsx b/packages/libro-common/src/mana-app/menu/menu.tsx
index ea6f9651..4fe5559f 100644
--- a/packages/libro-common/src/mana-app/menu/menu.tsx
+++ b/packages/libro-common/src/mana-app/menu/menu.tsx
@@ -9,7 +9,7 @@ import { MenuItem } from '../../mana-core/index.js';
 import { CommandRegistry, MenuRegistry } from '../../mana-core/index.js';
 import { prop } from '../../mana-observable/index.js';
 import { Menu as MenuComponent } from '../../react/index.js';
-import { inject, transient } from '../../mana-syringe/index.js';
+import { inject, transient } from '../../ioc/index.js';
 
 import { MenuItemRender } from './menu-item-render';
 import type { MenuData, MenuItemState } from './menu-protocol';
diff --git a/packages/libro-common/src/mana-app/modal/modal-contribution.ts b/packages/libro-common/src/mana-app/modal/modal-contribution.ts
index bb5d3040..9be3301d 100644
--- a/packages/libro-common/src/mana-app/modal/modal-contribution.ts
+++ b/packages/libro-common/src/mana-app/modal/modal-contribution.ts
@@ -1,6 +1,6 @@
 import { ApplicationContribution } from '../../mana-core/index.js';
-import { inject } from '../../mana-syringe/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { inject } from '../../ioc/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import { ModalService } from './modal-service';
 
diff --git a/packages/libro-common/src/mana-app/modal/modal-protocol.tsx b/packages/libro-common/src/mana-app/modal/modal-protocol.tsx
index e37af035..bcafae4c 100644
--- a/packages/libro-common/src/mana-app/modal/modal-protocol.tsx
+++ b/packages/libro-common/src/mana-app/modal/modal-protocol.tsx
@@ -1,4 +1,4 @@
-import { Syringe } from '../../mana-syringe/index.js';
+import { Syringe } from '../../ioc/index.js';
 
 export interface ModalItemProps<T> {
   modalItem: ModalItem<T>;
diff --git a/packages/libro-common/src/mana-app/modal/modal-render.tsx b/packages/libro-common/src/mana-app/modal/modal-render.tsx
index 7153b525..cea7d3f1 100644
--- a/packages/libro-common/src/mana-app/modal/modal-render.tsx
+++ b/packages/libro-common/src/mana-app/modal/modal-render.tsx
@@ -1,6 +1,6 @@
 import { BaseView, view } from '../../mana-core/index.js';
 import { useInject } from '../../mana-observable/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 import React from 'react';
 
 import { ModalService } from './modal-service';
diff --git a/packages/libro-common/src/mana-app/modal/modal-service.ts b/packages/libro-common/src/mana-app/modal/modal-service.ts
index ef2a7599..1205c0fa 100644
--- a/packages/libro-common/src/mana-app/modal/modal-service.ts
+++ b/packages/libro-common/src/mana-app/modal/modal-service.ts
@@ -1,7 +1,7 @@
 import type { Disposable } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { contrib, singleton } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, singleton } from '../../ioc/index.js';
 
 import type { ModalItem, ModalItemProps } from './modal-protocol';
 import { renderModal, ModalContribution } from './modal-protocol';
diff --git a/packages/libro-common/src/mana-app/notification/service.tsx b/packages/libro-common/src/mana-app/notification/service.tsx
index 8b49b48d..a0fe2f44 100644
--- a/packages/libro-common/src/mana-app/notification/service.tsx
+++ b/packages/libro-common/src/mana-app/notification/service.tsx
@@ -2,7 +2,7 @@ import { notification } from '../../react/index.js';
 import { v1 } from 'uuid';
 
 import { Disposable } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import type { NotificationConfig, NotificationAction } from './protocol';
 
diff --git a/packages/libro-common/src/mana-app/toolbar/toolbar-render.tsx b/packages/libro-common/src/mana-app/toolbar/toolbar-render.tsx
index 9c454f0b..6ef412b6 100644
--- a/packages/libro-common/src/mana-app/toolbar/toolbar-render.tsx
+++ b/packages/libro-common/src/mana-app/toolbar/toolbar-render.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import { ToolbarRegistry, ToolbarInstance, useUnmount } from '../../mana-core/index.js';
 import { useInject, ObservableContext } from '../../mana-observable/index.js';
-import type { Syringe } from '../../mana-syringe/index.js';
+import type { Syringe } from '../../ioc/index.js';
 import { useEffect, memo, useState, useContext, useMemo } from 'react';
 
 import type { Toolbar } from './toolbar';
diff --git a/packages/libro-common/src/mana-app/toolbar/toolbar.tsx b/packages/libro-common/src/mana-app/toolbar/toolbar.tsx
index f94cb211..cd62be39 100644
--- a/packages/libro-common/src/mana-app/toolbar/toolbar.tsx
+++ b/packages/libro-common/src/mana-app/toolbar/toolbar.tsx
@@ -13,7 +13,7 @@ import {
 } from '../../mana-core/index.js';
 import { l10n } from '../../l10n/index.js';
 import { getOrigin, prop } from '../../mana-observable/index.js';
-import { inject, transient } from '../../mana-syringe/index.js';
+import { inject, transient } from '../../ioc/index.js';
 
 import { ToolbarItemRender } from './toolbar-item-render';
 import type { ToolbarItemState } from './toolbar-protocol';
diff --git a/packages/libro-common/src/mana-app/tree/tree-decorator.ts b/packages/libro-common/src/mana-app/tree/tree-decorator.ts
index d6e4f33a..6de2c6fd 100644
--- a/packages/libro-common/src/mana-app/tree/tree-decorator.ts
+++ b/packages/libro-common/src/mana-app/tree/tree-decorator.ts
@@ -1,6 +1,6 @@
 import type { Event, Disposable, MaybePromise } from '../../common/index.js';
 import { Emitter, DisposableCollection } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import type { Tree, TreeNode } from './tree';
 import type { TreeViewDecorationData } from './tree-view-decoration';
diff --git a/packages/libro-common/src/mana-app/tree/tree-expansion.ts b/packages/libro-common/src/mana-app/tree/tree-expansion.ts
index ca02a1bd..5b390b4e 100644
--- a/packages/libro-common/src/mana-app/tree/tree-expansion.ts
+++ b/packages/libro-common/src/mana-app/tree/tree-expansion.ts
@@ -1,6 +1,6 @@
 import type { Event, Disposable } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
-import { singleton, inject, postConstruct } from '../../mana-syringe/index.js';
+import { singleton, inject, postConstruct } from '../../ioc/index.js';
 
 import type { TreeNode } from './tree';
 import { CompositeTreeNode, Tree } from './tree';
diff --git a/packages/libro-common/src/mana-app/tree/tree-impl.ts b/packages/libro-common/src/mana-app/tree/tree-impl.ts
index 204d32d7..1329764b 100644
--- a/packages/libro-common/src/mana-app/tree/tree-impl.ts
+++ b/packages/libro-common/src/mana-app/tree/tree-impl.ts
@@ -5,7 +5,7 @@ import { timeout } from '../../common/index.js';
 import { CancellationTokenSource } from '../../common/index.js';
 import { DisposableCollection } from '../../common/index.js';
 import { Emitter, WaitUntilEvent } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import type { TreeNode } from './tree';
 import { Tree, CompositeTreeNode } from './tree';
diff --git a/packages/libro-common/src/mana-app/tree/tree-label-provider.ts b/packages/libro-common/src/mana-app/tree/tree-label-provider.ts
index ae7da50e..d0044395 100644
--- a/packages/libro-common/src/mana-app/tree/tree-label-provider.ts
+++ b/packages/libro-common/src/mana-app/tree/tree-label-provider.ts
@@ -1,4 +1,4 @@
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import { LabelProviderContribution } from '../label/label-provider';
 
diff --git a/packages/libro-common/src/mana-app/tree/tree-model.ts b/packages/libro-common/src/mana-app/tree/tree-model.ts
index 9808f415..fe58b291 100644
--- a/packages/libro-common/src/mana-app/tree/tree-model.ts
+++ b/packages/libro-common/src/mana-app/tree/tree-model.ts
@@ -2,7 +2,7 @@
 import type { Event, WaitUntilEvent, CancellationToken } from '../../common/index.js';
 import { Emitter, DisposableCollection } from '../../common/index.js';
 import type { SelectionProvider } from '../../mana-core/index.js';
-import { inject, singleton, postConstruct } from '../../mana-syringe/index.js';
+import { inject, singleton, postConstruct } from '../../ioc/index.js';
 
 import type { TreeNode } from './tree';
 import { Tree, CompositeTreeNode } from './tree';
diff --git a/packages/libro-common/src/mana-app/tree/tree-navigation.ts b/packages/libro-common/src/mana-app/tree/tree-navigation.ts
index cdbd47d4..c736cf26 100644
--- a/packages/libro-common/src/mana-app/tree/tree-navigation.ts
+++ b/packages/libro-common/src/mana-app/tree/tree-navigation.ts
@@ -1,4 +1,4 @@
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import type { TreeNode } from './tree';
 
diff --git a/packages/libro-common/src/mana-app/tree/tree-selection-impl.ts b/packages/libro-common/src/mana-app/tree/tree-selection-impl.ts
index e601260a..9f462b00 100644
--- a/packages/libro-common/src/mana-app/tree/tree-selection-impl.ts
+++ b/packages/libro-common/src/mana-app/tree/tree-selection-impl.ts
@@ -1,6 +1,6 @@
 import type { Event } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
-import { singleton, inject, postConstruct } from '../../mana-syringe/index.js';
+import { singleton, inject, postConstruct } from '../../ioc/index.js';
 
 import type { TreeNode } from './tree';
 import { Tree } from './tree';
diff --git a/packages/libro-common/src/mana-app/tree/view/tree-view-decorator.ts b/packages/libro-common/src/mana-app/tree/view/tree-view-decorator.ts
index 9f5b14e8..6e31df5d 100644
--- a/packages/libro-common/src/mana-app/tree/view/tree-view-decorator.ts
+++ b/packages/libro-common/src/mana-app/tree/view/tree-view-decorator.ts
@@ -5,7 +5,7 @@ import debounce from 'lodash.debounce';
 import type { Disposable } from '../../../common/index.js';
 import { DisposableCollection } from '../../../common/index.js';
 import { notEmpty } from '../../../common/index.js';
-import { inject, postConstruct, singleton } from '../../../mana-syringe/index.js';
+import { inject, postConstruct, singleton } from '../../../ioc/index.js';
 import type { TreeNode } from '../tree';
 import { DecoratedTreeNode, TreeDecoratorService } from '../tree-decorator';
 import { TreeModel } from '../tree-model';
diff --git a/packages/libro-common/src/mana-app/tree/view/tree-view.tsx b/packages/libro-common/src/mana-app/tree/view/tree-view.tsx
index 44209648..aa39039a 100644
--- a/packages/libro-common/src/mana-app/tree/view/tree-view.tsx
+++ b/packages/libro-common/src/mana-app/tree/view/tree-view.tsx
@@ -21,7 +21,7 @@ import {
 } from '../../../mana-core/index.js';
 import { getOrigin, prop, useInject } from '../../../mana-observable/index.js';
 import { Dropdown } from '../../../react/index.js';
-import { inject, postConstruct, singleton } from '../../../mana-syringe/index.js';
+import { inject, postConstruct, singleton } from '../../../ioc/index.js';
 import { LabelProvider } from '../../label';
 import { MenuRender } from '../../menu';
 import {
diff --git a/packages/libro-common/src/mana-app/view/box/index.tsx b/packages/libro-common/src/mana-app/view/box/index.tsx
index 27e7cd91..142eb68d 100644
--- a/packages/libro-common/src/mana-app/view/box/index.tsx
+++ b/packages/libro-common/src/mana-app/view/box/index.tsx
@@ -9,7 +9,7 @@ import { ViewInstance } from '../../../mana-core/index.js';
 import type { SlotViewOption } from '../../../mana-core/index.js';
 import { prop, useInject } from '../../../mana-observable/index.js';
 import { BoxPanel } from '../../../react/index.js';
-import { inject, transient } from '../../../mana-syringe/index.js';
+import { inject, transient } from '../../../ioc/index.js';
 import React from 'react';
 
 type Direction = 'left-to-right' | 'right-to-left' | 'top-to-bottom' | 'bottom-to-top';
diff --git a/packages/libro-common/src/mana-app/view/flex/index.tsx b/packages/libro-common/src/mana-app/view/flex/index.tsx
index 9b5383ea..c99b4699 100644
--- a/packages/libro-common/src/mana-app/view/flex/index.tsx
+++ b/packages/libro-common/src/mana-app/view/flex/index.tsx
@@ -8,7 +8,7 @@ import {
 import { ViewInstance } from '../../../mana-core/index.js';
 import type { SlotViewOption } from '../../../mana-core/index.js';
 import { prop, useInject } from '../../../mana-observable/index.js';
-import { inject, transient } from '../../../mana-syringe/index.js';
+import { inject, transient } from '../../../ioc/index.js';
 import cls from 'classnames';
 import React from 'react';
 import './index.less';
diff --git a/packages/libro-common/src/mana-app/view/header/header-view.tsx b/packages/libro-common/src/mana-app/view/header/header-view.tsx
index 4800cddd..085ffd84 100644
--- a/packages/libro-common/src/mana-app/view/header/header-view.tsx
+++ b/packages/libro-common/src/mana-app/view/header/header-view.tsx
@@ -1,6 +1,6 @@
 import { DefaultSlotView, view, Slot } from '../../../mana-core/index.js';
 import { BoxPanel } from '../../../react/index.js';
-import { singleton } from '../../../mana-syringe/index.js';
+import { singleton } from '../../../ioc/index.js';
 import * as React from 'react';
 import './index.less';
 
diff --git a/packages/libro-common/src/mana-app/view/tab/card-tab-view.tsx b/packages/libro-common/src/mana-app/view/tab/card-tab-view.tsx
index d7fabe13..570344de 100644
--- a/packages/libro-common/src/mana-app/view/tab/card-tab-view.tsx
+++ b/packages/libro-common/src/mana-app/view/tab/card-tab-view.tsx
@@ -1,6 +1,6 @@
 import { view, ViewManager, ViewOption } from '../../../mana-core/index.js';
 import type { TabsProps } from '../../../react/index.js';
-import { inject, transient } from '../../../mana-syringe/index.js';
+import { inject, transient } from '../../../ioc/index.js';
 import cls from 'classnames';
 
 import type { TabOption } from './tab-view';
diff --git a/packages/libro-common/src/mana-app/view/tab/side-tab-view.tsx b/packages/libro-common/src/mana-app/view/tab/side-tab-view.tsx
index 72c3f131..5c546669 100644
--- a/packages/libro-common/src/mana-app/view/tab/side-tab-view.tsx
+++ b/packages/libro-common/src/mana-app/view/tab/side-tab-view.tsx
@@ -4,7 +4,7 @@ import { ViewManager } from '../../../mana-core/index.js';
 import { view, ViewOption, ViewContext } from '../../../mana-core/index.js';
 import { equals, prop } from '../../../mana-observable/index.js';
 import type { TabsProps } from '../../../react/index.js';
-import { inject, transient } from '../../../mana-syringe/index.js';
+import { inject, transient } from '../../../ioc/index.js';
 import cls from 'classnames';
 
 import { ToolbarRender } from '../../toolbar/toolbar-render';
diff --git a/packages/libro-common/src/mana-app/view/tab/tab-menu.ts b/packages/libro-common/src/mana-app/view/tab/tab-menu.ts
index ba2cb1e2..a0593407 100644
--- a/packages/libro-common/src/mana-app/view/tab/tab-menu.ts
+++ b/packages/libro-common/src/mana-app/view/tab/tab-menu.ts
@@ -1,7 +1,7 @@
 import type { Command } from '../../../mana-core/index.js';
 import { CommandContribution, CommandRegistry } from '../../../mana-core/index.js';
 import { l10n } from '../../../l10n/index.js'; /* eslint-disable max-len, @typescript-eslint/indent */
-import { inject, singleton } from '../../../mana-syringe/index.js';
+import { inject, singleton } from '../../../ioc/index.js';
 
 export const CLOSE_TAB: Command = {
   id: 'tab.close',
diff --git a/packages/libro-common/src/mana-app/view/tab/tab-view.tsx b/packages/libro-common/src/mana-app/view/tab/tab-view.tsx
index aff08242..99c0833d 100644
--- a/packages/libro-common/src/mana-app/view/tab/tab-view.tsx
+++ b/packages/libro-common/src/mana-app/view/tab/tab-view.tsx
@@ -13,7 +13,7 @@ import { useInject } from '../../../mana-observable/index.js';
 import { prop } from '../../../mana-observable/index.js';
 import { Tabs, Dropdown } from '../../../react/index.js';
 import type { TabPaneProps, TabsProps } from '../../../react/index.js';
-import { inject, transient } from '../../../mana-syringe/index.js';
+import { inject, transient } from '../../../ioc/index.js';
 import classnames from 'classnames';
 import type { ReactNode } from 'react';
 import { forwardRef } from 'react';
diff --git a/packages/libro-common/src/mana-core/application/application-state.ts b/packages/libro-common/src/mana-core/application/application-state.ts
index 74326ecd..30599b4f 100644
--- a/packages/libro-common/src/mana-core/application/application-state.ts
+++ b/packages/libro-common/src/mana-core/application/application-state.ts
@@ -1,7 +1,7 @@
 import type { Event } from '../../common/index.js';
 import { Emitter, Deferred } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import { inject, singleton } from '../../mana-syringe/index.js';
+import { inject, singleton } from '../../ioc/index.js';
 import { DebugService } from '../common/debug';
 
 export enum ApplicationState {
diff --git a/packages/libro-common/src/mana-core/application/application.ts b/packages/libro-common/src/mana-core/application/application.ts
index 2fcda878..c823e2b3 100644
--- a/packages/libro-common/src/mana-core/application/application.ts
+++ b/packages/libro-common/src/mana-core/application/application.ts
@@ -1,14 +1,8 @@
 import type { MaybePromise } from '../../common/index.js';
 import { Disposable } from '../../common/index.js';
 import { Emitter, DisposableCollection } from '../../common/index.js';
-import {
-  inject,
-  singleton,
-  Syringe,
-  contrib,
-  Utils,
-} from '../../mana-syringe/index.js';
-import type { Decorator, Contribution } from '../../mana-syringe/index.js';
+import { inject, singleton, Syringe, contrib, Utils } from '../../ioc/index.js';
+import type { Decorator, Contribution } from '../../ioc/index.js';
 
 import { DebugService } from '../common/debug';
 
diff --git a/packages/libro-common/src/mana-core/application/default-window-service.ts b/packages/libro-common/src/mana-core/application/default-window-service.ts
index 1f9b4ddc..f9016abf 100644
--- a/packages/libro-common/src/mana-core/application/default-window-service.ts
+++ b/packages/libro-common/src/mana-core/application/default-window-service.ts
@@ -1,6 +1,6 @@
 import type { Event } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import { ApplicationContribution } from './application';
 import type { Application } from './application';
diff --git a/packages/libro-common/src/mana-core/application/mock-window-service.ts b/packages/libro-common/src/mana-core/application/mock-window-service.ts
index b1e6314d..3e14e5eb 100644
--- a/packages/libro-common/src/mana-core/application/mock-window-service.ts
+++ b/packages/libro-common/src/mana-core/application/mock-window-service.ts
@@ -1,5 +1,5 @@
 import { Event } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import type { WindowService } from './application-protocol';
 
diff --git a/packages/libro-common/src/mana-core/command/command-registry.ts b/packages/libro-common/src/mana-core/command/command-registry.ts
index 172cc16e..a24b50ed 100644
--- a/packages/libro-common/src/mana-core/command/command-registry.ts
+++ b/packages/libro-common/src/mana-core/command/command-registry.ts
@@ -5,9 +5,9 @@ import {
   DisposableCollection,
 } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { Syringe } from '../../mana-syringe/index.js';
-import { contrib, singleton } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { Syringe } from '../../ioc/index.js';
+import { contrib, singleton } from '../../ioc/index.js';
 import { ApplicationContribution } from '../application/application';
 
 import type {
diff --git a/packages/libro-common/src/mana-core/components/context.tsx b/packages/libro-common/src/mana-core/components/context.tsx
index 74cff2d8..48d7fb29 100644
--- a/packages/libro-common/src/mana-core/components/context.tsx
+++ b/packages/libro-common/src/mana-core/components/context.tsx
@@ -1,5 +1,5 @@
 import { ObservableContext } from '../../mana-observable/index.js';
-import type { Syringe } from '../../mana-syringe/index.js';
+import type { Syringe } from '../../ioc/index.js';
 import * as React from 'react';
 
 import type { ManaContext } from '../module/mana-module-context';
diff --git a/packages/libro-common/src/mana-core/components/hooks.tsx b/packages/libro-common/src/mana-core/components/hooks.tsx
index b2a3fc92..2cd23f1a 100644
--- a/packages/libro-common/src/mana-core/components/hooks.tsx
+++ b/packages/libro-common/src/mana-core/components/hooks.tsx
@@ -1,6 +1,6 @@
 import { ObservableContext } from '../../mana-observable/index.js';
-import type { Syringe } from '../../mana-syringe/index.js';
-import { GlobalContainer } from '../../mana-syringe/index.js';
+import type { Syringe } from '../../ioc/index.js';
+import { GlobalContainer } from '../../ioc/index.js';
 import * as React from 'react';
 
 import { ManaContext } from '../module/mana-module-context';
diff --git a/packages/libro-common/src/mana-core/configuration/configuration-cache.ts b/packages/libro-common/src/mana-core/configuration/configuration-cache.ts
index 9f5c6db1..71c2eb0a 100644
--- a/packages/libro-common/src/mana-core/configuration/configuration-cache.ts
+++ b/packages/libro-common/src/mana-core/configuration/configuration-cache.ts
@@ -1,5 +1,5 @@
 import type { Disposable } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import type { ConfigurationNode } from './configuration-protocol';
 import type { ConfigurationProvider } from './configuration-provider';
diff --git a/packages/libro-common/src/mana-core/configuration/configuration-provider.ts b/packages/libro-common/src/mana-core/configuration/configuration-provider.ts
index 618cc019..86cb76c9 100644
--- a/packages/libro-common/src/mana-core/configuration/configuration-provider.ts
+++ b/packages/libro-common/src/mana-core/configuration/configuration-provider.ts
@@ -1,6 +1,6 @@
 import type { MaybePromise } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import { singleton, Syringe } from '../../mana-syringe/index.js';
+import { singleton, Syringe } from '../../ioc/index.js';
 
 import type { ConfigurationNode } from './configuration-protocol';
 import type { ConfigurationStorage } from './configuration-storage';
diff --git a/packages/libro-common/src/mana-core/configuration/configuration-registry.ts b/packages/libro-common/src/mana-core/configuration/configuration-registry.ts
index 7ceb3e93..9436727b 100644
--- a/packages/libro-common/src/mana-core/configuration/configuration-registry.ts
+++ b/packages/libro-common/src/mana-core/configuration/configuration-registry.ts
@@ -1,7 +1,7 @@
 import type { MaybePromise } from '../../common/index.js';
 import { DisposableCollection } from '../../common/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { contrib, inject, singleton, Syringe } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, inject, singleton, Syringe } from '../../ioc/index.js';
 
 import { ApplicationContribution } from '../application/index';
 
diff --git a/packages/libro-common/src/mana-core/configuration/configuration-render-registry.ts b/packages/libro-common/src/mana-core/configuration/configuration-render-registry.ts
index 09119d38..327dd885 100644
--- a/packages/libro-common/src/mana-core/configuration/configuration-render-registry.ts
+++ b/packages/libro-common/src/mana-core/configuration/configuration-render-registry.ts
@@ -1,5 +1,5 @@
-import type { Contribution } from '../../mana-syringe/index.js';
-import { contrib, singleton, Syringe } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, singleton, Syringe } from '../../ioc/index.js';
 import type { JSONSchemaType } from 'ajv';
 import type React from 'react';
 
diff --git a/packages/libro-common/src/mana-core/configuration/configuration-service.ts b/packages/libro-common/src/mana-core/configuration/configuration-service.ts
index f3d2f06f..55baf4f4 100644
--- a/packages/libro-common/src/mana-core/configuration/configuration-service.ts
+++ b/packages/libro-common/src/mana-core/configuration/configuration-service.ts
@@ -1,7 +1,7 @@
 import { Emitter } from '../../common/index.js';
 import { getOrigin } from '../../mana-observable/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { contrib, inject, singleton } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, inject, singleton } from '../../ioc/index.js';
 
 import { ApplicationContribution } from '../application';
 
diff --git a/packages/libro-common/src/mana-core/configuration/validation.ts b/packages/libro-common/src/mana-core/configuration/validation.ts
index 297b8c87..e825ab13 100644
--- a/packages/libro-common/src/mana-core/configuration/validation.ts
+++ b/packages/libro-common/src/mana-core/configuration/validation.ts
@@ -1,5 +1,5 @@
 import { getOrigin } from '../../mana-observable/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 import Ajv from 'ajv';
 
 import type { ConfigurationNode } from './configuration-protocol';
diff --git a/packages/libro-common/src/mana-core/context/data-context-manager.ts b/packages/libro-common/src/mana-core/context/data-context-manager.ts
index 20382d0d..e0467a9d 100644
--- a/packages/libro-common/src/mana-core/context/data-context-manager.ts
+++ b/packages/libro-common/src/mana-core/context/data-context-manager.ts
@@ -1,5 +1,5 @@
-import type { Contribution, Syringe } from '../../mana-syringe/index.js';
-import { contrib, inject, singleton } from '../../mana-syringe/index.js';
+import type { Contribution, Syringe } from '../../ioc/index.js';
+import { contrib, inject, singleton } from '../../ioc/index.js';
 
 import { ManaContext } from '../module';
 
diff --git a/packages/libro-common/src/mana-core/context/data-context-protocol.ts b/packages/libro-common/src/mana-core/context/data-context-protocol.ts
index 2df4e105..d340df15 100644
--- a/packages/libro-common/src/mana-core/context/data-context-protocol.ts
+++ b/packages/libro-common/src/mana-core/context/data-context-protocol.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Syringe } from '../../mana-syringe/index.js';
+import { Syringe } from '../../ioc/index.js';
 
 import type { ManaModule } from '../module';
 
diff --git a/packages/libro-common/src/mana-core/keybinding/context-key-service.ts b/packages/libro-common/src/mana-core/keybinding/context-key-service.ts
index 10bac0ad..c3bf66ba 100644
--- a/packages/libro-common/src/mana-core/keybinding/context-key-service.ts
+++ b/packages/libro-common/src/mana-core/keybinding/context-key-service.ts
@@ -1,5 +1,5 @@
 import { Emitter } from '../../common/index.js';
-import { inject, postConstruct, singleton } from '../../mana-syringe/index.js';
+import { inject, postConstruct, singleton } from '../../ioc/index.js';
 
 import type { ContextKeyExpression, IContextKey } from './vs/contextkey';
 import { ContextKeyExpr } from './vs/contextkey';
diff --git a/packages/libro-common/src/mana-core/keybinding/keybinding-proocol.ts b/packages/libro-common/src/mana-core/keybinding/keybinding-proocol.ts
index ee74e2d1..dcea1ca0 100644
--- a/packages/libro-common/src/mana-core/keybinding/keybinding-proocol.ts
+++ b/packages/libro-common/src/mana-core/keybinding/keybinding-proocol.ts
@@ -1,4 +1,4 @@
-import { Syringe } from '../../mana-syringe/index.js';
+import { Syringe } from '../../ioc/index.js';
 
 import type { KeybindingRegistry } from './keybinding';
 
diff --git a/packages/libro-common/src/mana-core/keybinding/keybinding.ts b/packages/libro-common/src/mana-core/keybinding/keybinding.ts
index 07a2cff3..347eaf55 100644
--- a/packages/libro-common/src/mana-core/keybinding/keybinding.ts
+++ b/packages/libro-common/src/mana-core/keybinding/keybinding.ts
@@ -1,8 +1,8 @@
 import type { Event } from '../../common/index.js';
 import { isOSX } from '../../common/index.js';
 import { Emitter, Disposable, DisposableCollection } from '../../common/index.js';
-import { contrib, inject, singleton, Syringe } from '../../mana-syringe/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
+import { contrib, inject, singleton, Syringe } from '../../ioc/index.js';
+import type { Contribution } from '../../ioc/index.js';
 
 import type { Application } from '../application';
 import { ApplicationContribution } from '../application';
diff --git a/packages/libro-common/src/mana-core/keybinding/vs/configuration/configuration.ts b/packages/libro-common/src/mana-core/keybinding/vs/configuration/configuration.ts
index 262fa120..39ff2ad9 100644
--- a/packages/libro-common/src/mana-core/keybinding/vs/configuration/configuration.ts
+++ b/packages/libro-common/src/mana-core/keybinding/vs/configuration/configuration.ts
@@ -5,7 +5,7 @@
 
 import type { Event, IStringDictionary } from '../../../../common/index.js';
 import { objects, types, URI } from '../../../../common/index.js';
-import { Syringe } from '../../../../mana-syringe/index.js';
+import { Syringe } from '../../../../ioc/index.js';
 import { Registry } from '../platform';
 
 // import type { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace';
diff --git a/packages/libro-common/src/mana-core/keybinding/vs/configuration/configurationService.ts b/packages/libro-common/src/mana-core/keybinding/vs/configuration/configurationService.ts
index 44a5daf2..4f6972bd 100644
--- a/packages/libro-common/src/mana-core/keybinding/vs/configuration/configurationService.ts
+++ b/packages/libro-common/src/mana-core/keybinding/vs/configuration/configurationService.ts
@@ -5,7 +5,7 @@
 
 import { Emitter } from '../../../../common/index.js';
 import type { Event } from '../../../../common/index.js';
-import { singleton } from '../../../../mana-syringe/index.js';
+import { singleton } from '../../../../ioc/index.js';
 
 import type { IDisposable } from '../../../utils/lifecycle';
 import { VSDisposable } from '../../../utils/lifecycle';
diff --git a/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts b/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts
index 5428aeb2..e743bd12 100644
--- a/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts
+++ b/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts
@@ -8,7 +8,7 @@ import { Iterable } from '../../../common/index.js';
 import { PauseableEmitter } from '../../../common/index.js';
 import { objects } from '../../../common/index.js';
 import { prop } from '../../../mana-observable/index.js';
-import { inject, injectable, singleton } from '../../../mana-syringe/index.js';
+import { inject, injectable, singleton } from '../../../ioc/index.js';
 import type { CommandRegistry } from '../../command/index';
 import type { CommandContribution } from '../../command/index';
 import { DisposableStore, MutableDisposable } from '../../utils';
diff --git a/packages/libro-common/src/mana-core/keybinding/vs/contextkey.ts b/packages/libro-common/src/mana-core/keybinding/vs/contextkey.ts
index 7d5f1f5d..1efcb94e 100644
--- a/packages/libro-common/src/mana-core/keybinding/vs/contextkey.ts
+++ b/packages/libro-common/src/mana-core/keybinding/vs/contextkey.ts
@@ -13,7 +13,7 @@ import {
   isWindows,
   isWeb,
 } from '../../../common/index.js';
-import { Syringe } from '../../../mana-syringe/index.js';
+import { Syringe } from '../../../ioc/index.js';
 
 const _userAgent = userAgent || '';
 const STATIC_VALUES = new Map<string, boolean>();
diff --git a/packages/libro-common/src/mana-core/keyboard/browser-keyboard-layout-provider.ts b/packages/libro-common/src/mana-core/keyboard/browser-keyboard-layout-provider.ts
index 5ad2727d..7e489115 100644
--- a/packages/libro-common/src/mana-core/keyboard/browser-keyboard-layout-provider.ts
+++ b/packages/libro-common/src/mana-core/keyboard/browser-keyboard-layout-provider.ts
@@ -1,7 +1,7 @@
 import type { Event } from '../../common/index.js';
 import { Deferred, Emitter } from '../../common/index.js';
 import { isOSX } from '../../common/index.js';
-import { inject, postConstruct, singleton } from '../../mana-syringe/index.js';
+import { inject, postConstruct, singleton } from '../../ioc/index.js';
 
 import { LocalStorageService } from '../common';
 
diff --git a/packages/libro-common/src/mana-core/keyboard/keyboard-layout-service.ts b/packages/libro-common/src/mana-core/keyboard/keyboard-layout-service.ts
index 46dc050f..7bb02b72 100644
--- a/packages/libro-common/src/mana-core/keyboard/keyboard-layout-service.ts
+++ b/packages/libro-common/src/mana-core/keyboard/keyboard-layout-service.ts
@@ -5,7 +5,7 @@
 /* eslint-disable no-plusplus */
 import type { Event } from '../../common/index.js';
 import { Emitter, isWindows } from '../../common/index.js';
-import { inject, optional, singleton } from '../../mana-syringe/index.js';
+import { inject, optional, singleton } from '../../ioc/index.js';
 import type { IWindowsKeyMapping } from 'native-keymap';
 
 import type { NativeKeyboardLayout } from './keyboard-protocol';
diff --git a/packages/libro-common/src/mana-core/menu/default-menu-node.ts b/packages/libro-common/src/mana-core/menu/default-menu-node.ts
index 3dcf1a5d..4493c9d6 100644
--- a/packages/libro-common/src/mana-core/menu/default-menu-node.ts
+++ b/packages/libro-common/src/mana-core/menu/default-menu-node.ts
@@ -2,7 +2,7 @@
 import type { Disposable, Event } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
 import { getOrigin, prop } from '../../mana-observable/index.js';
-import { inject, transient } from '../../mana-syringe/index.js';
+import { inject, transient } from '../../ioc/index.js';
 
 import { CommandRegistry } from '../command/command-registry';
 import { renderNode } from '../view/utils';
diff --git a/packages/libro-common/src/mana-core/menu/menu-registry.ts b/packages/libro-common/src/mana-core/menu/menu-registry.ts
index e4a1a39c..26f599fd 100644
--- a/packages/libro-common/src/mana-core/menu/menu-registry.ts
+++ b/packages/libro-common/src/mana-core/menu/menu-registry.ts
@@ -1,7 +1,7 @@
 import type { MaybePromise } from '../../common/index.js';
 import { Disposable } from '../../common/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { contrib, inject, singleton, Syringe } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, inject, singleton, Syringe } from '../../ioc/index.js';
 
 import { ApplicationContribution } from '../application/application';
 import { CommandRegistry } from '../command/command-registry';
diff --git a/packages/libro-common/src/mana-core/module/mana-module-context.ts b/packages/libro-common/src/mana-core/module/mana-module-context.ts
index 94912573..257cce61 100644
--- a/packages/libro-common/src/mana-core/module/mana-module-context.ts
+++ b/packages/libro-common/src/mana-core/module/mana-module-context.ts
@@ -1,4 +1,4 @@
-import type { Syringe } from '../../mana-syringe/index.js';
+import type { Syringe } from '../../ioc/index.js';
 
 import { ManaModule } from './mana-module';
 
diff --git a/packages/libro-common/src/mana-core/module/mana-module.test.ts b/packages/libro-common/src/mana-core/module/mana-module.test.ts
index 24eed6fe..70d4dae6 100644
--- a/packages/libro-common/src/mana-core/module/mana-module.test.ts
+++ b/packages/libro-common/src/mana-core/module/mana-module.test.ts
@@ -1,6 +1,6 @@
 import assert from 'assert';
 
-import { Container, singleton } from '../../mana-syringe/index.js';
+import { Container, singleton } from '../../ioc/index.js';
 
 import { ManaModule } from './mana-module';
 import { ManaContext } from './mana-module-context';
diff --git a/packages/libro-common/src/mana-core/module/mana-module.ts b/packages/libro-common/src/mana-core/module/mana-module.ts
index dd6eb5ef..2822b7d9 100644
--- a/packages/libro-common/src/mana-core/module/mana-module.ts
+++ b/packages/libro-common/src/mana-core/module/mana-module.ts
@@ -1,6 +1,6 @@
 import type { MaybePromise } from '../../common/index.js';
 import { Deferred } from '../../common/index.js';
-import { SyringeModule } from '../../mana-syringe/index.js';
+import { SyringeModule } from '../../ioc/index.js';
 
 import type { CanloadModule, ModuleLoader, ModulePreload } from './module-protocol';
 
diff --git a/packages/libro-common/src/mana-core/module/module-protocol.ts b/packages/libro-common/src/mana-core/module/module-protocol.ts
index 312c28f4..b9018967 100644
--- a/packages/libro-common/src/mana-core/module/module-protocol.ts
+++ b/packages/libro-common/src/mana-core/module/module-protocol.ts
@@ -1,5 +1,5 @@
 import type { MaybePromise } from '../../common/index.js';
-import type { Syringe, SyringeModuleLoader } from '../../mana-syringe/index.js';
+import type { Syringe, SyringeModuleLoader } from '../../ioc/index.js';
 
 import type { ManaModule } from './mana-module';
 
diff --git a/packages/libro-common/src/mana-core/selection/selection-service.ts b/packages/libro-common/src/mana-core/selection/selection-service.ts
index 0572e746..fe0d27fd 100644
--- a/packages/libro-common/src/mana-core/selection/selection-service.ts
+++ b/packages/libro-common/src/mana-core/selection/selection-service.ts
@@ -1,6 +1,6 @@
 import type { Event } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 export type SelectionProvider<T> = {
   onSelectionChanged: Event<T | undefined>;
diff --git a/packages/libro-common/src/mana-core/theme/base-variable-registry.ts b/packages/libro-common/src/mana-core/theme/base-variable-registry.ts
index a4054977..3371152a 100644
--- a/packages/libro-common/src/mana-core/theme/base-variable-registry.ts
+++ b/packages/libro-common/src/mana-core/theme/base-variable-registry.ts
@@ -5,7 +5,7 @@ import {
   objects,
   isPromiseLike,
 } from '../../common/index.js';
-import { singleton, inject } from '../../mana-syringe/index.js';
+import { singleton, inject } from '../../ioc/index.js';
 
 import { localStorageService } from '../common';
 import type { StorageService } from '../common';
diff --git a/packages/libro-common/src/mana-core/theme/basic/antd-variable-contribution.ts b/packages/libro-common/src/mana-core/theme/basic/antd-variable-contribution.ts
index 32afbb0f..1f40f1c6 100644
--- a/packages/libro-common/src/mana-core/theme/basic/antd-variable-contribution.ts
+++ b/packages/libro-common/src/mana-core/theme/basic/antd-variable-contribution.ts
@@ -1,4 +1,4 @@
-import { singleton } from '../../../mana-syringe/index.js';
+import { singleton } from '../../../ioc/index.js';
 
 import { VariableContribution } from './variable-protocol';
 import type { VariableRegistry } from './variable-registry';
diff --git a/packages/libro-common/src/mana-core/theme/basic/default-variable-contribution.ts b/packages/libro-common/src/mana-core/theme/basic/default-variable-contribution.ts
index 6d27c19c..ecfe9ecf 100644
--- a/packages/libro-common/src/mana-core/theme/basic/default-variable-contribution.ts
+++ b/packages/libro-common/src/mana-core/theme/basic/default-variable-contribution.ts
@@ -1,4 +1,4 @@
-import { singleton } from '../../../mana-syringe/index.js';
+import { singleton } from '../../../ioc/index.js';
 
 import { VariableContribution } from './variable-protocol';
 import type { VariableRegistry } from './variable-registry';
diff --git a/packages/libro-common/src/mana-core/theme/basic/variable-protocol.ts b/packages/libro-common/src/mana-core/theme/basic/variable-protocol.ts
index 942e8555..6ad4d80e 100644
--- a/packages/libro-common/src/mana-core/theme/basic/variable-protocol.ts
+++ b/packages/libro-common/src/mana-core/theme/basic/variable-protocol.ts
@@ -1,4 +1,4 @@
-import { Syringe } from '../../../mana-syringe/index.js';
+import { Syringe } from '../../../ioc/index.js';
 
 import type { VariableRegistry } from './variable-registry';
 
diff --git a/packages/libro-common/src/mana-core/theme/basic/variable-registry.ts b/packages/libro-common/src/mana-core/theme/basic/variable-registry.ts
index f1f90260..17ae0c3a 100644
--- a/packages/libro-common/src/mana-core/theme/basic/variable-registry.ts
+++ b/packages/libro-common/src/mana-core/theme/basic/variable-registry.ts
@@ -1,5 +1,5 @@
 import type { Disposable } from '../../../common/index.js';
-import { singleton } from '../../../mana-syringe/index.js';
+import { singleton } from '../../../ioc/index.js';
 import { BaseVariableRegistry } from '../base-variable-registry';
 import type { VariableDefinition } from '../protocol';
 
diff --git a/packages/libro-common/src/mana-core/theme/color/antd-color-contribution.ts b/packages/libro-common/src/mana-core/theme/color/antd-color-contribution.ts
index 7efc91e9..a246dc25 100644
--- a/packages/libro-common/src/mana-core/theme/color/antd-color-contribution.ts
+++ b/packages/libro-common/src/mana-core/theme/color/antd-color-contribution.ts
@@ -1,4 +1,4 @@
-import { singleton } from '../../../mana-syringe/index.js';
+import { singleton } from '../../../ioc/index.js';
 
 import { ColorContribution } from './color-protocol';
 import type { ColorRegistry } from './color-registry';
diff --git a/packages/libro-common/src/mana-core/theme/color/color-protocol.ts b/packages/libro-common/src/mana-core/theme/color/color-protocol.ts
index 8bdafb94..80dd6d2c 100644
--- a/packages/libro-common/src/mana-core/theme/color/color-protocol.ts
+++ b/packages/libro-common/src/mana-core/theme/color/color-protocol.ts
@@ -1,4 +1,4 @@
-import { Syringe } from '../../../mana-syringe/index.js';
+import { Syringe } from '../../../ioc/index.js';
 import type { VariableDefinition } from '../protocol';
 
 import type { Color } from './color';
diff --git a/packages/libro-common/src/mana-core/theme/color/color-registry.ts b/packages/libro-common/src/mana-core/theme/color/color-registry.ts
index 3bdc87a1..7b4bad53 100644
--- a/packages/libro-common/src/mana-core/theme/color/color-registry.ts
+++ b/packages/libro-common/src/mana-core/theme/color/color-registry.ts
@@ -1,5 +1,5 @@
 import type { Disposable } from '../../../common/index.js';
-import { singleton } from '../../../mana-syringe/index.js';
+import { singleton } from '../../../ioc/index.js';
 import { BaseVariableRegistry } from '../base-variable-registry';
 import type { VariableDefinition } from '../protocol';
 
diff --git a/packages/libro-common/src/mana-core/theme/color/default-color-contribution.ts b/packages/libro-common/src/mana-core/theme/color/default-color-contribution.ts
index 0fdb0242..d6443ba7 100644
--- a/packages/libro-common/src/mana-core/theme/color/default-color-contribution.ts
+++ b/packages/libro-common/src/mana-core/theme/color/default-color-contribution.ts
@@ -1,4 +1,4 @@
-import { singleton } from '../../../mana-syringe/index.js';
+import { singleton } from '../../../ioc/index.js';
 
 import { ColorContribution } from './color-protocol';
 import type { ColorRegistry } from './color-registry';
diff --git a/packages/libro-common/src/mana-core/theme/color/index.spec.ts b/packages/libro-common/src/mana-core/theme/color/index.spec.ts
index 2e93c393..6e6bb787 100644
--- a/packages/libro-common/src/mana-core/theme/color/index.spec.ts
+++ b/packages/libro-common/src/mana-core/theme/color/index.spec.ts
@@ -1,7 +1,7 @@
 import 'react';
 import assert from 'assert';
 
-import { Container } from '../../mana-syringe/index.js';
+import { Container } from '../../ioc/index.js';
 
 import { ThemeService } from '../theme-service';
 
diff --git a/packages/libro-common/src/mana-core/theme/index.spec.ts b/packages/libro-common/src/mana-core/theme/index.spec.ts
index 3effa682..b5e88345 100644
--- a/packages/libro-common/src/mana-core/theme/index.spec.ts
+++ b/packages/libro-common/src/mana-core/theme/index.spec.ts
@@ -1,7 +1,7 @@
 import 'react';
 import assert from 'assert';
 
-import { Container } from '../../mana-syringe/index.js';
+import { Container } from '../../ioc/index.js';
 
 import { ApplicationModule } from '../index';
 
diff --git a/packages/libro-common/src/mana-core/theme/theme-app.ts b/packages/libro-common/src/mana-core/theme/theme-app.ts
index 1e654492..958c7f19 100644
--- a/packages/libro-common/src/mana-core/theme/theme-app.ts
+++ b/packages/libro-common/src/mana-core/theme/theme-app.ts
@@ -1,6 +1,6 @@
 import { Disposable, DisposableCollection } from '../../common/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { contrib, inject, singleton } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, inject, singleton } from '../../ioc/index.js';
 
 import type { Application } from '../application/index';
 import { ApplicationContribution } from '../application/index';
diff --git a/packages/libro-common/src/mana-core/theme/theme-service.ts b/packages/libro-common/src/mana-core/theme/theme-service.ts
index 02d45fa5..ac017acc 100644
--- a/packages/libro-common/src/mana-core/theme/theme-service.ts
+++ b/packages/libro-common/src/mana-core/theme/theme-service.ts
@@ -2,7 +2,7 @@ import type { Event } from '../../common/index.js';
 import { isPromiseLike } from '../../common/index.js';
 import { Emitter, Disposable, objects } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import { localStorageService } from '../common';
 import type { StorageService } from '../common';
diff --git a/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts b/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts
index cb630bb7..080cd298 100644
--- a/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts
+++ b/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts
@@ -1,8 +1,8 @@
 import type { Event } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import { inject } from '../../mana-syringe/index.js';
-import { transient } from '../../mana-syringe/index.js';
+import { inject } from '../../ioc/index.js';
+import { transient } from '../../ioc/index.js';
 
 import { ToolbarNode } from './toolbar-protocol';
 import type { ToolbarItem } from './toolbar-protocol';
diff --git a/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts b/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts
index 86c3801f..2234054c 100644
--- a/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts
+++ b/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts
@@ -1,7 +1,7 @@
 import { Emitter } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { contrib, inject, singleton, Syringe } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, inject, singleton, Syringe } from '../../ioc/index.js';
 
 import { ApplicationContribution } from '../application';
 
diff --git a/packages/libro-common/src/mana-core/utils/lifecycle.ts b/packages/libro-common/src/mana-core/utils/lifecycle.ts
index 1c9fb11e..dbee5892 100644
--- a/packages/libro-common/src/mana-core/utils/lifecycle.ts
+++ b/packages/libro-common/src/mana-core/utils/lifecycle.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Iterable } from '../../common/index.js';
-import { injectable } from '../../mana-syringe/index.js';
+import { injectable } from '../../ioc/index.js';
 
 export function once<T extends (...args: any[]) => any>(this: unknown, fn: T): T {
   // eslint-disable-next-line @typescript-eslint/no-this-alias
diff --git a/packages/libro-common/src/mana-core/view/decorator.ts b/packages/libro-common/src/mana-core/view/decorator.ts
index a61bc596..963a8af0 100644
--- a/packages/libro-common/src/mana-core/view/decorator.ts
+++ b/packages/libro-common/src/mana-core/view/decorator.ts
@@ -1,6 +1,6 @@
 import type { Newable } from '../../common/index.js';
-import type { Syringe } from '../../mana-syringe/index.js';
-import { registerSideOption } from '../../mana-syringe/index.js';
+import type { Syringe } from '../../ioc/index.js';
+import { registerSideOption } from '../../ioc/index.js';
 
 import type { ManaModule } from '../module';
 import { ManaContext } from '../module';
diff --git a/packages/libro-common/src/mana-core/view/default-slot-view.tsx b/packages/libro-common/src/mana-core/view/default-slot-view.tsx
index 77de25f2..e443f665 100644
--- a/packages/libro-common/src/mana-core/view/default-slot-view.tsx
+++ b/packages/libro-common/src/mana-core/view/default-slot-view.tsx
@@ -7,7 +7,7 @@ import {
   prop,
   useInject,
 } from '../../mana-observable/index.js';
-import { inject, transient } from '../../mana-syringe/index.js';
+import { inject, transient } from '../../ioc/index.js';
 import * as React from 'react';
 
 import { view } from './decorator';
diff --git a/packages/libro-common/src/mana-core/view/default-view.tsx b/packages/libro-common/src/mana-core/view/default-view.tsx
index 4e8661ed..22993892 100644
--- a/packages/libro-common/src/mana-core/view/default-view.tsx
+++ b/packages/libro-common/src/mana-core/view/default-view.tsx
@@ -1,7 +1,7 @@
 import type { Event } from '../../common/index.js';
 import { DisposableCollection, Emitter } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import { transient } from '../../mana-syringe/index.js';
+import { transient } from '../../ioc/index.js';
 import * as React from 'react';
 
 import { ViewTitle } from './title';
diff --git a/packages/libro-common/src/mana-core/view/focus-tracker.ts b/packages/libro-common/src/mana-core/view/focus-tracker.ts
index abf78873..3ec93ada 100644
--- a/packages/libro-common/src/mana-core/view/focus-tracker.ts
+++ b/packages/libro-common/src/mana-core/view/focus-tracker.ts
@@ -1,7 +1,7 @@
 import type { Disposable, Event as EmitterEvent } from '../../common/index.js';
 import { Iterable } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
-import { singleton } from '../../mana-syringe/index.js';
+import { singleton } from '../../ioc/index.js';
 
 import type { View } from './view-protocol';
 
diff --git a/packages/libro-common/src/mana-core/view/open-handler.ts b/packages/libro-common/src/mana-core/view/open-handler.ts
index 30db0d7a..1a40900f 100644
--- a/packages/libro-common/src/mana-core/view/open-handler.ts
+++ b/packages/libro-common/src/mana-core/view/open-handler.ts
@@ -1,7 +1,7 @@
 import type { MaybePromise, Event, Disposable, URI } from '../../common/index.js';
 import { Priority } from '../../common/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { singleton, contrib, Syringe } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { singleton, contrib, Syringe } from '../../ioc/index.js';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface OpenerOptions {}
diff --git a/packages/libro-common/src/mana-core/view/portal-slot-view.tsx b/packages/libro-common/src/mana-core/view/portal-slot-view.tsx
index 11b1beae..fd2adcf5 100644
--- a/packages/libro-common/src/mana-core/view/portal-slot-view.tsx
+++ b/packages/libro-common/src/mana-core/view/portal-slot-view.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/unified-signatures */
 import { Disposable, DisposableCollection } from '../../common/index.js';
 import { equals, getOrigin, prop, useInject } from '../../mana-observable/index.js';
-import { inject, transient } from '../../mana-syringe/index.js';
+import { inject, transient } from '../../ioc/index.js';
 import * as React from 'react';
 
 import { view } from './decorator';
diff --git a/packages/libro-common/src/mana-core/view/root-view.tsx b/packages/libro-common/src/mana-core/view/root-view.tsx
index 16ba4e8e..537101f8 100644
--- a/packages/libro-common/src/mana-core/view/root-view.tsx
+++ b/packages/libro-common/src/mana-core/view/root-view.tsx
@@ -1,6 +1,6 @@
 import { timeout } from '../../common/index.js';
 import { prop, useInject } from '../../mana-observable/index.js';
-import { inject, singleton } from '../../mana-syringe/index.js';
+import { inject, singleton } from '../../ioc/index.js';
 import * as React from 'react';
 
 import { ApplicationState, ApplicationStateService } from '../application';
diff --git a/packages/libro-common/src/mana-core/view/slot-view-manager.ts b/packages/libro-common/src/mana-core/view/slot-view-manager.ts
index e92ff4a1..6edb9260 100644
--- a/packages/libro-common/src/mana-core/view/slot-view-manager.ts
+++ b/packages/libro-common/src/mana-core/view/slot-view-manager.ts
@@ -3,8 +3,8 @@ import { Emitter } from '../../common/index.js';
 import { Deferred } from '../../common/index.js';
 import { Disposable, Priority } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import { contrib, inject, singleton } from '../../mana-syringe/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
+import { contrib, inject, singleton } from '../../ioc/index.js';
+import type { Contribution } from '../../ioc/index.js';
 
 import { DebugService } from '../common/debug';
 
diff --git a/packages/libro-common/src/mana-core/view/title.tsx b/packages/libro-common/src/mana-core/view/title.tsx
index 2d2538a3..3145d262 100644
--- a/packages/libro-common/src/mana-core/view/title.tsx
+++ b/packages/libro-common/src/mana-core/view/title.tsx
@@ -1,5 +1,5 @@
 import { prop } from '../../mana-observable/index.js';
-import { transient } from '../../mana-syringe/index.js';
+import { transient } from '../../ioc/index.js';
 import type * as React from 'react';
 
 import type { View } from './view-protocol';
diff --git a/packages/libro-common/src/mana-core/view/view-application.ts b/packages/libro-common/src/mana-core/view/view-application.ts
index 19a9cd87..a85d5538 100644
--- a/packages/libro-common/src/mana-core/view/view-application.ts
+++ b/packages/libro-common/src/mana-core/view/view-application.ts
@@ -1,4 +1,4 @@
-import { inject, singleton } from '../../mana-syringe/index.js';
+import { inject, singleton } from '../../ioc/index.js';
 
 import { ApplicationContribution } from '../application';
 
diff --git a/packages/libro-common/src/mana-core/view/view-container.tsx b/packages/libro-common/src/mana-core/view/view-container.tsx
index c4923fcd..c69f9427 100644
--- a/packages/libro-common/src/mana-core/view/view-container.tsx
+++ b/packages/libro-common/src/mana-core/view/view-container.tsx
@@ -1,5 +1,5 @@
 import { ObservableContext, useInject } from '../../mana-observable/index.js';
-import type { Syringe } from '../../mana-syringe/index.js';
+import type { Syringe } from '../../ioc/index.js';
 import * as React from 'react';
 
 import { useMount, useUnmount } from '../utils/hooks';
diff --git a/packages/libro-common/src/mana-core/view/view-manager.ts b/packages/libro-common/src/mana-core/view/view-manager.ts
index 0783c91d..e0ffb3eb 100644
--- a/packages/libro-common/src/mana-core/view/view-manager.ts
+++ b/packages/libro-common/src/mana-core/view/view-manager.ts
@@ -3,8 +3,8 @@ import type { MaybePromise, Event, Newable, Disposable } from '../../common/inde
 import { DisposableCollection } from '../../common/index.js';
 import { Priority, Emitter } from '../../common/index.js';
 import { prop } from '../../mana-observable/index.js';
-import type { Contribution } from '../../mana-syringe/index.js';
-import { contrib, inject, singleton } from '../../mana-syringe/index.js';
+import type { Contribution } from '../../ioc/index.js';
+import { contrib, inject, singleton } from '../../ioc/index.js';
 
 import { DebugService } from '../common/debug';
 import type { ManaContext } from '../module';
diff --git a/packages/libro-common/src/mana-core/view/view-open-handler.ts b/packages/libro-common/src/mana-core/view/view-open-handler.ts
index 54fd3706..2bf5fb8c 100644
--- a/packages/libro-common/src/mana-core/view/view-open-handler.ts
+++ b/packages/libro-common/src/mana-core/view/view-open-handler.ts
@@ -1,6 +1,6 @@
 import type { Event, MaybePromise, URI } from '../../common/index.js';
 import { Emitter } from '../../common/index.js';
-import { inject, postConstruct, singleton } from '../../mana-syringe/index.js';
+import { inject, postConstruct, singleton } from '../../ioc/index.js';
 
 import type { BaseView } from './default-view';
 import type { OpenHandler } from './open-handler';
diff --git a/packages/libro-common/src/mana-core/view/view-protocol.ts b/packages/libro-common/src/mana-core/view/view-protocol.ts
index 08f391a6..1dac9e83 100644
--- a/packages/libro-common/src/mana-core/view/view-protocol.ts
+++ b/packages/libro-common/src/mana-core/view/view-protocol.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { MaybePromise, Event, Disposable, Newable } from '../../common/index.js';
-import { Syringe } from '../../mana-syringe/index.js';
+import { Syringe } from '../../ioc/index.js';
 import type React from 'react';
 
 import type { ManaModule } from '../module';
diff --git a/packages/libro-common/src/mana-core/view/view-storage.ts b/packages/libro-common/src/mana-core/view/view-storage.ts
index c6e8ea0c..73a3b987 100644
--- a/packages/libro-common/src/mana-core/view/view-storage.ts
+++ b/packages/libro-common/src/mana-core/view/view-storage.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { prop } from '../../mana-observable/index.js';
-import { inject, singleton } from '../../mana-syringe/index.js';
+import { inject, singleton } from '../../ioc/index.js';
 
 import { DebugService, StorageService } from '../common';
 
diff --git a/packages/libro-common/src/mana-observable/context.spec.tsx b/packages/libro-common/src/mana-observable/context.spec.tsx
index ea3d9c85..4c64b3e3 100644
--- a/packages/libro-common/src/mana-observable/context.spec.tsx
+++ b/packages/libro-common/src/mana-observable/context.spec.tsx
@@ -6,8 +6,8 @@ import type { ErrorInfo, ReactNode } from 'react';
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 
-import { singleton } from '../mana-syringe/index.js';
-import { GlobalContainer, inject } from '../mana-syringe/index.js';
+import { singleton } from '../ioc/index.js';
+import { GlobalContainer, inject } from '../ioc/index.js';
 
 import {
   defaultObservableContext,