diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 61ee6f2ad..459c16acb 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -6,7 +6,7 @@
 
 ## Upgrading
 
-<!-- Here goes notes on how to upgrade from previous versions, including deprecations and what they should be replaced with -->
+* The microgrid client dependency has been updated to version 0.9.0
 
 ## New Features
 
diff --git a/benchmarks/power_distribution/power_distributor.py b/benchmarks/power_distribution/power_distributor.py
index 447fac850..fd15466a6 100644
--- a/benchmarks/power_distribution/power_distributor.py
+++ b/benchmarks/power_distribution/power_distributor.py
@@ -12,7 +12,8 @@
 from typing import Any
 
 from frequenz.channels import Broadcast
-from frequenz.client.microgrid import Component, ComponentCategory, ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import Component, ComponentCategory
 from frequenz.quantities import Power
 
 from frequenz.sdk import microgrid
diff --git a/pyproject.toml b/pyproject.toml
index fb650c665..191826864 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,12 +29,13 @@ dependencies = [
   # Make sure to update the mkdocs.yml file when
   # changing the version
   # (plugins.mkdocstrings.handlers.python.import)
-  "frequenz-client-microgrid >= 0.7.0, < 0.8.0",
-  "frequenz-channels >= 1.6.0, < 2.0.0",
+  "frequenz-client-microgrid >= 0.9.0, < 0.10.0",
+  "frequenz-client-common >= 0.3.2, < 0.4.0",
+  "frequenz-channels >= 1.6.1, < 2.0.0",
   "frequenz-quantities[marshmallow] >= 1.0.0, < 2.0.0",
   "networkx >= 2.8, < 4",
   "numpy >= 2, < 3",
-  "typing_extensions >= 4.6.1, < 5",
+  "typing_extensions >= 4.13.0, < 5",
   "marshmallow >= 3.19.0, < 5",
   "marshmallow_dataclass >= 8.7.1, < 9",
 ]
@@ -163,14 +164,7 @@ disable = [
 max-attributes = 12
 
 [tool.pytest.ini_options]
-# We need to ignore PytestUnraisableExceptionWarning because we have some
-# cleanup issues, and sometimes exceptions are raised in __del__ methods, for
-# example when trying to do async stuff and the event loop is already closed.
-# This could even be caused by the GC, some time after the test function that
-# has the issue was completed.
-# Please see this issue for more details:
-# https://github.com/frequenz-floss/frequenz-sdk-python/issues/982
-addopts = "-W=all -Werror -Wdefault::DeprecationWarning -Wdefault::PendingDeprecationWarning -Wdefault::pytest.PytestUnraisableExceptionWarning -vv"
+addopts = "-vv"
 testpaths = ["tests", "src"]
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "function"
@@ -178,6 +172,22 @@ required_plugins = ["pytest-asyncio", "pytest-mock"]
 markers = [
   "integration: integration tests (deselect with '-m \"not integration\"')",
 ]
+filterwarnings = [
+  "error",
+  "once::DeprecationWarning",
+  "once::PendingDeprecationWarning",
+  # We need to ignore PytestUnraisableExceptionWarning because we have some
+  # cleanup issues, and sometimes exceptions are raised in __del__ methods, for
+  # example when trying to do async stuff and the event loop is already closed.
+  # This could even be caused by the GC, some time after the test function that
+  # has the issue was completed.
+  # Please see this issue for more details:
+  # https://github.com/frequenz-floss/frequenz-sdk-python/issues/982
+  "default::pytest.PytestUnraisableExceptionWarning",
+  # We use a raw string (single quote) to avoid the need to escape special
+  # chars as this is a regex
+  'ignore:Protobuf gencode version .*exactly one major version older.*:UserWarning',
+]
 
 [tool.mypy]
 explicit_package_bases = true
diff --git a/src/frequenz/sdk/actor/_background_service.py b/src/frequenz/sdk/actor/_background_service.py
index 8bcdd9910..a5302b17a 100644
--- a/src/frequenz/sdk/actor/_background_service.py
+++ b/src/frequenz/sdk/actor/_background_service.py
@@ -268,13 +268,6 @@ def __await__(self) -> collections.abc.Generator[None, None, None]:
         """
         return self.wait().__await__()
 
-    def __del__(self) -> None:
-        """Destroy this instance.
-
-        Cancel all running tasks spawned by this background service.
-        """
-        self.cancel("{self!r} was deleted")
-
     def __repr__(self) -> str:
         """Return a string representation of this instance.
 
diff --git a/src/frequenz/sdk/microgrid/_data_pipeline.py b/src/frequenz/sdk/microgrid/_data_pipeline.py
index 31b0e3bd0..be7e2f738 100644
--- a/src/frequenz/sdk/microgrid/_data_pipeline.py
+++ b/src/frequenz/sdk/microgrid/_data_pipeline.py
@@ -17,7 +17,8 @@
 from datetime import timedelta
 
 from frequenz.channels import Broadcast, Sender
-from frequenz.client.microgrid import ComponentCategory, ComponentId, InverterType
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory, InverterType
 
 from frequenz.sdk.microgrid._power_managing._base_classes import Algorithm, DefaultPower
 
diff --git a/src/frequenz/sdk/microgrid/_data_sourcing/_component_metric_request.py b/src/frequenz/sdk/microgrid/_data_sourcing/_component_metric_request.py
index ff9045dfc..8ded8aebc 100644
--- a/src/frequenz/sdk/microgrid/_data_sourcing/_component_metric_request.py
+++ b/src/frequenz/sdk/microgrid/_data_sourcing/_component_metric_request.py
@@ -6,7 +6,8 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-from frequenz.client.microgrid import ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentMetricId
 
 __all__ = ["ComponentMetricRequest", "ComponentMetricId"]
 
diff --git a/src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py b/src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py
index b5bfa6c6a..d73dbe1eb 100644
--- a/src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py
+++ b/src/frequenz/sdk/microgrid/_data_sourcing/microgrid_api_source.py
@@ -9,10 +9,10 @@
 from typing import Any
 
 from frequenz.channels import Receiver, Sender
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     BatteryData,
     ComponentCategory,
-    ComponentId,
     ComponentMetricId,
     EVChargerData,
     InverterData,
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py
index a0c39b907..7f29fab6a 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_battery_manager.py
@@ -11,11 +11,11 @@
 from datetime import timedelta
 
 from frequenz.channels import LatestValueCache, Receiver, Sender
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     ApiClientError,
     BatteryData,
     ComponentCategory,
-    ComponentId,
     InverterData,
     OperationOutOfRange,
 )
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_component_manager.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_component_manager.py
index c561970f3..3d9c2a4ad 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_component_manager.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_component_manager.py
@@ -7,7 +7,7 @@
 import collections.abc
 
 from frequenz.channels import Sender
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 
 from .._component_status import ComponentPoolStatus
 from ..request import Request
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_config.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_config.py
index 9c18aa91c..99b567d00 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_config.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_config.py
@@ -7,7 +7,7 @@
 from dataclasses import dataclass, field
 from datetime import timedelta
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Current
 
 
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py
index 83c6981b3..477c242b8 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_ev_charger_manager.py
@@ -16,10 +16,10 @@
     select,
     selected_from,
 )
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     ApiClientError,
     ComponentCategory,
-    ComponentId,
     EVChargerData,
     MicrogridApiClient,
 )
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_states.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_states.py
index 1da97d00b..eb8c46d83 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_states.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_ev_charger_manager/_states.py
@@ -8,7 +8,8 @@
 from datetime import datetime
 from typing import Iterable
 
-from frequenz.client.microgrid import ComponentId, EVChargerData
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import EVChargerData
 from frequenz.quantities import Power
 
 
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py
index 4814ebe97..38c2c75be 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_managers/_pv_inverter_manager/_pv_inverter_manager.py
@@ -9,10 +9,10 @@
 from datetime import timedelta
 
 from frequenz.channels import LatestValueCache, Sender
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     ApiClientError,
     ComponentCategory,
-    ComponentId,
     InverterData,
     InverterType,
 )
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_pool_status_tracker.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_pool_status_tracker.py
index f52301a08..8a0541f8e 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_pool_status_tracker.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_pool_status_tracker.py
@@ -11,7 +11,7 @@
 from datetime import timedelta
 
 from frequenz.channels import Broadcast, Merger, Receiver, Sender, merge
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 
 from ..._internal._asyncio import cancel_and_await
 from ._component_status import (
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py
index 075f96784..027299492 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_battery_status_tracker.py
@@ -23,13 +23,13 @@
 
 from frequenz.channels import Receiver, Sender, select, selected_from
 from frequenz.channels.timer import SkipMissedAndDrift, Timer
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     BatteryComponentState,
     BatteryData,
     BatteryRelayState,
     ComponentCategory,
     ComponentData,
-    ComponentId,
     ErrorLevel,
     InverterComponentState,
     InverterData,
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_component_status.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_component_status.py
index 1ce761e14..126ccddc0 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_component_status.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_component_status.py
@@ -11,7 +11,7 @@
 from datetime import timedelta
 
 from frequenz.channels import Receiver, Sender
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 
 from ....actor._background_service import BackgroundService
 
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_ev_charger_status_tracker.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_ev_charger_status_tracker.py
index 389f5c632..56d3b3c1f 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_ev_charger_status_tracker.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_ev_charger_status_tracker.py
@@ -10,8 +10,8 @@
 
 from frequenz.channels import Receiver, Sender, select, selected_from
 from frequenz.channels.timer import SkipMissedAndDrift, Timer
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
-    ComponentId,
     EVChargerCableState,
     EVChargerComponentState,
     EVChargerData,
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_pv_inverter_status_tracker.py b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_pv_inverter_status_tracker.py
index 120e0f3b4..467da6dc8 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_pv_inverter_status_tracker.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_component_status/_pv_inverter_status_tracker.py
@@ -9,7 +9,8 @@
 
 from frequenz.channels import Receiver, Sender, select, selected_from
 from frequenz.channels.timer import SkipMissedAndDrift, Timer
-from frequenz.client.microgrid import ComponentId, InverterComponentState, InverterData
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import InverterComponentState, InverterData
 from typing_extensions import override
 
 from ...._internal._asyncio import run_forever
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/_distribution_algorithm/_battery_distribution_algorithm.py b/src/frequenz/sdk/microgrid/_power_distributing/_distribution_algorithm/_battery_distribution_algorithm.py
index f6b373e3e..918af5a9d 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/_distribution_algorithm/_battery_distribution_algorithm.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/_distribution_algorithm/_battery_distribution_algorithm.py
@@ -8,7 +8,8 @@
 from dataclasses import dataclass
 from typing import NamedTuple, Sequence
 
-from frequenz.client.microgrid import BatteryData, ComponentId, InverterData
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import BatteryData, InverterData
 from frequenz.quantities import Power
 
 from ...._internal._math import is_close_to_zero
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/power_distributing.py b/src/frequenz/sdk/microgrid/_power_distributing/power_distributing.py
index 40bceead4..6653e2fec 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/power_distributing.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/power_distributing.py
@@ -15,12 +15,8 @@
 from datetime import timedelta
 
 from frequenz.channels import Receiver, Sender
-from frequenz.client.microgrid import (
-    ComponentCategory,
-    ComponentId,
-    ComponentType,
-    InverterType,
-)
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory, ComponentType, InverterType
 from typing_extensions import override
 
 from ...actor._actor import Actor
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/request.py b/src/frequenz/sdk/microgrid/_power_distributing/request.py
index de73d27fa..213957f7c 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/request.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/request.py
@@ -6,7 +6,7 @@
 import dataclasses
 from collections import abc
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Power
 
 
diff --git a/src/frequenz/sdk/microgrid/_power_distributing/result.py b/src/frequenz/sdk/microgrid/_power_distributing/result.py
index f40bc0476..dd9fde853 100644
--- a/src/frequenz/sdk/microgrid/_power_distributing/result.py
+++ b/src/frequenz/sdk/microgrid/_power_distributing/result.py
@@ -7,7 +7,7 @@
 import dataclasses
 from collections import abc
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Power
 
 from .request import Request
@@ -119,7 +119,6 @@ class OutOfBounds(_BaseResultMixin):
     from frequenz.sdk.actor.power_distributing.request import Request
     from frequenz.sdk.actor.power_distributing.result import PowerBounds
     from frequenz.quantities import Power
-    from frequenz.client.microgrid import ComponentId
 
     def handle_power_request_result(result: Result) -> None:
         match result:
diff --git a/src/frequenz/sdk/microgrid/_power_managing/_base_classes.py b/src/frequenz/sdk/microgrid/_power_managing/_base_classes.py
index c4ea5bd9d..8928e4781 100644
--- a/src/frequenz/sdk/microgrid/_power_managing/_base_classes.py
+++ b/src/frequenz/sdk/microgrid/_power_managing/_base_classes.py
@@ -10,7 +10,7 @@
 import enum
 import typing
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Power
 
 from ... import timeseries
diff --git a/src/frequenz/sdk/microgrid/_power_managing/_matryoshka.py b/src/frequenz/sdk/microgrid/_power_managing/_matryoshka.py
index 3c2810a5f..bb2b6d385 100644
--- a/src/frequenz/sdk/microgrid/_power_managing/_matryoshka.py
+++ b/src/frequenz/sdk/microgrid/_power_managing/_matryoshka.py
@@ -23,7 +23,7 @@
 import typing
 from datetime import timedelta
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Power
 from typing_extensions import override
 
diff --git a/src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py b/src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py
index a6dfb1541..05a9d4e42 100644
--- a/src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py
+++ b/src/frequenz/sdk/microgrid/_power_managing/_power_managing_actor.py
@@ -13,12 +13,8 @@
 
 from frequenz.channels import Receiver, Sender, select, selected_from
 from frequenz.channels.timer import SkipMissedAndDrift, Timer
-from frequenz.client.microgrid import (
-    ComponentCategory,
-    ComponentId,
-    ComponentType,
-    InverterType,
-)
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory, ComponentType, InverterType
 from typing_extensions import override
 
 from ..._internal._asyncio import run_forever
diff --git a/src/frequenz/sdk/microgrid/_power_managing/_shifting_matryoshka.py b/src/frequenz/sdk/microgrid/_power_managing/_shifting_matryoshka.py
index 3e9202685..dfe6ff7ae 100644
--- a/src/frequenz/sdk/microgrid/_power_managing/_shifting_matryoshka.py
+++ b/src/frequenz/sdk/microgrid/_power_managing/_shifting_matryoshka.py
@@ -9,7 +9,7 @@
 import typing
 from datetime import timedelta
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Power
 from typing_extensions import override
 
diff --git a/src/frequenz/sdk/microgrid/component_graph.py b/src/frequenz/sdk/microgrid/component_graph.py
index af752669f..e9d17acf8 100644
--- a/src/frequenz/sdk/microgrid/component_graph.py
+++ b/src/frequenz/sdk/microgrid/component_graph.py
@@ -27,10 +27,10 @@
 from collections.abc import Callable, Iterable
 
 import networkx as nx
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     Component,
     ComponentCategory,
-    ComponentId,
     Connection,
     InverterType,
     MicrogridApiClient,
diff --git a/src/frequenz/sdk/microgrid/connection_manager.py b/src/frequenz/sdk/microgrid/connection_manager.py
index b6a8b5a0f..b2c4270b0 100644
--- a/src/frequenz/sdk/microgrid/connection_manager.py
+++ b/src/frequenz/sdk/microgrid/connection_manager.py
@@ -11,12 +11,8 @@
 import logging
 from abc import ABC, abstractmethod
 
-from frequenz.client.microgrid import (
-    Location,
-    Metadata,
-    MicrogridApiClient,
-    MicrogridId,
-)
+from frequenz.client.common.microgrid import MicrogridId
+from frequenz.client.microgrid import Location, Metadata, MicrogridApiClient
 
 from .component_graph import ComponentGraph, _MicrogridComponentGraph
 
diff --git a/src/frequenz/sdk/timeseries/_grid_frequency.py b/src/frequenz/sdk/timeseries/_grid_frequency.py
index 4630d8cf5..a1499b068 100644
--- a/src/frequenz/sdk/timeseries/_grid_frequency.py
+++ b/src/frequenz/sdk/timeseries/_grid_frequency.py
@@ -9,12 +9,8 @@
 import logging
 
 from frequenz.channels import Receiver, Sender
-from frequenz.client.microgrid import (
-    Component,
-    ComponentCategory,
-    ComponentId,
-    ComponentMetricId,
-)
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId
 from frequenz.quantities import Frequency, Quantity
 
 from .._internal._channels import ChannelRegistry
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_battery_pool.py b/src/frequenz/sdk/timeseries/battery_pool/_battery_pool.py
index c4b6ddc0a..dd0a4c798 100644
--- a/src/frequenz/sdk/timeseries/battery_pool/_battery_pool.py
+++ b/src/frequenz/sdk/timeseries/battery_pool/_battery_pool.py
@@ -12,7 +12,7 @@
 import uuid
 from collections import abc
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Energy, Percentage, Power, Temperature
 
 from ... import timeseries
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_battery_pool_reference_store.py b/src/frequenz/sdk/timeseries/battery_pool/_battery_pool_reference_store.py
index 83f643345..f3194d3b2 100644
--- a/src/frequenz/sdk/timeseries/battery_pool/_battery_pool_reference_store.py
+++ b/src/frequenz/sdk/timeseries/battery_pool/_battery_pool_reference_store.py
@@ -11,7 +11,8 @@
 from typing import Any
 
 from frequenz.channels import Receiver, Sender
-from frequenz.client.microgrid import ComponentCategory, ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory
 
 from ..._internal._asyncio import cancel_and_await
 from ..._internal._channels import ChannelRegistry, ReceiverFetcher
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_component_metric_fetcher.py b/src/frequenz/sdk/timeseries/battery_pool/_component_metric_fetcher.py
index 7ff16b98e..676838f46 100644
--- a/src/frequenz/sdk/timeseries/battery_pool/_component_metric_fetcher.py
+++ b/src/frequenz/sdk/timeseries/battery_pool/_component_metric_fetcher.py
@@ -14,11 +14,11 @@
 from typing import Any, Generic, Self, TypeVar
 
 from frequenz.channels import ChannelClosedError, Receiver
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     BatteryData,
     ComponentCategory,
     ComponentData,
-    ComponentId,
     ComponentMetricId,
     InverterData,
 )
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_component_metrics.py b/src/frequenz/sdk/timeseries/battery_pool/_component_metrics.py
index 1ad537323..ee898059f 100644
--- a/src/frequenz/sdk/timeseries/battery_pool/_component_metrics.py
+++ b/src/frequenz/sdk/timeseries/battery_pool/_component_metrics.py
@@ -8,7 +8,8 @@
 from dataclasses import dataclass
 from datetime import datetime
 
-from frequenz.client.microgrid import ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentMetricId
 
 
 @dataclass(frozen=True, eq=False)
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_methods.py b/src/frequenz/sdk/timeseries/battery_pool/_methods.py
index 7ffef88a4..9e4a5cb3d 100644
--- a/src/frequenz/sdk/timeseries/battery_pool/_methods.py
+++ b/src/frequenz/sdk/timeseries/battery_pool/_methods.py
@@ -11,7 +11,7 @@
 from typing import Generic
 
 from frequenz.channels import Broadcast, Receiver
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 
 from ..._internal._asyncio import cancel_and_await, run_forever
 from ..._internal._constants import RECEIVER_MAX_SIZE, WAIT_FOR_COMPONENT_DATA_SEC
diff --git a/src/frequenz/sdk/timeseries/battery_pool/_metric_calculator.py b/src/frequenz/sdk/timeseries/battery_pool/_metric_calculator.py
index 488cffeb2..5f1269dc9 100644
--- a/src/frequenz/sdk/timeseries/battery_pool/_metric_calculator.py
+++ b/src/frequenz/sdk/timeseries/battery_pool/_metric_calculator.py
@@ -11,7 +11,8 @@
 from datetime import datetime, timezone
 from typing import Generic, TypeVar
 
-from frequenz.client.microgrid import ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentMetricId
 from frequenz.quantities import Energy, Percentage, Power, Temperature
 
 from ... import timeseries
diff --git a/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py b/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py
index b4b9298e3..e54f7c49e 100644
--- a/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py
+++ b/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool.py
@@ -8,7 +8,7 @@
 import uuid
 from collections import abc
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Current, Power
 
 from ..._internal._channels import MappingReceiverFetcher, ReceiverFetcher
diff --git a/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool_reference_store.py b/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool_reference_store.py
index 048d95c13..6fa8a0ec7 100644
--- a/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool_reference_store.py
+++ b/src/frequenz/sdk/timeseries/ev_charger_pool/_ev_charger_pool_reference_store.py
@@ -8,7 +8,8 @@
 from collections import abc
 
 from frequenz.channels import Broadcast, Receiver, Sender
-from frequenz.client.microgrid import ComponentCategory, ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory
 
 from ..._internal._channels import ChannelRegistry, ReceiverFetcher
 from ...microgrid import connection_manager
diff --git a/src/frequenz/sdk/timeseries/ev_charger_pool/_system_bounds_tracker.py b/src/frequenz/sdk/timeseries/ev_charger_pool/_system_bounds_tracker.py
index e6180cf2f..15374cc2a 100644
--- a/src/frequenz/sdk/timeseries/ev_charger_pool/_system_bounds_tracker.py
+++ b/src/frequenz/sdk/timeseries/ev_charger_pool/_system_bounds_tracker.py
@@ -8,7 +8,8 @@
 from collections import abc
 
 from frequenz.channels import Receiver, Sender, merge, select, selected_from
-from frequenz.client.microgrid import ComponentId, EVChargerData
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import EVChargerData
 from frequenz.quantities import Power
 
 from ..._internal._asyncio import run_forever
diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_chp_power_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_chp_power_formula.py
index 0dd877b67..2ad32379b 100644
--- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_chp_power_formula.py
+++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_chp_power_formula.py
@@ -7,7 +7,8 @@
 import logging
 from collections import abc
 
-from frequenz.client.microgrid import ComponentCategory, ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory, ComponentMetricId
 from frequenz.quantities import Power
 
 from ....microgrid import connection_manager
diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_ev_charger_current_formula.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_ev_charger_current_formula.py
index f692090e0..bc6454584 100644
--- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_ev_charger_current_formula.py
+++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_ev_charger_current_formula.py
@@ -7,7 +7,8 @@
 import logging
 from collections import abc
 
-from frequenz.client.microgrid import ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentMetricId
 from frequenz.quantities import Current
 
 from .._formula_engine import FormulaEngine, FormulaEngine3Phase
diff --git a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_formula_generator.py b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_formula_generator.py
index 21e5c87bd..eeef83f93 100644
--- a/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_formula_generator.py
+++ b/src/frequenz/sdk/timeseries/formula_engine/_formula_generators/_formula_generator.py
@@ -13,12 +13,8 @@
 from typing import Generic
 
 from frequenz.channels import Sender
-from frequenz.client.microgrid import (
-    Component,
-    ComponentCategory,
-    ComponentId,
-    ComponentMetricId,
-)
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import Component, ComponentCategory, ComponentMetricId
 
 from ...._internal._channels import ChannelRegistry
 from ....microgrid import connection_manager
diff --git a/src/frequenz/sdk/timeseries/formula_engine/_resampled_formula_builder.py b/src/frequenz/sdk/timeseries/formula_engine/_resampled_formula_builder.py
index 0f4eb9a89..db2e96b7d 100644
--- a/src/frequenz/sdk/timeseries/formula_engine/_resampled_formula_builder.py
+++ b/src/frequenz/sdk/timeseries/formula_engine/_resampled_formula_builder.py
@@ -8,7 +8,8 @@
 from collections.abc import Callable
 
 from frequenz.channels import Receiver, Sender
-from frequenz.client.microgrid import ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentMetricId
 from frequenz.quantities import Quantity
 
 from ..._internal._channels import ChannelRegistry
diff --git a/src/frequenz/sdk/timeseries/pv_pool/_pv_pool.py b/src/frequenz/sdk/timeseries/pv_pool/_pv_pool.py
index 07323d51d..00a75577a 100644
--- a/src/frequenz/sdk/timeseries/pv_pool/_pv_pool.py
+++ b/src/frequenz/sdk/timeseries/pv_pool/_pv_pool.py
@@ -7,7 +7,7 @@
 import uuid
 from collections import abc
 
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Power
 
 from ..._internal._channels import MappingReceiverFetcher, ReceiverFetcher
diff --git a/src/frequenz/sdk/timeseries/pv_pool/_pv_pool_reference_store.py b/src/frequenz/sdk/timeseries/pv_pool/_pv_pool_reference_store.py
index 7b0ee7e47..2c0da5e72 100644
--- a/src/frequenz/sdk/timeseries/pv_pool/_pv_pool_reference_store.py
+++ b/src/frequenz/sdk/timeseries/pv_pool/_pv_pool_reference_store.py
@@ -9,7 +9,8 @@
 from collections import abc
 
 from frequenz.channels import Broadcast, Receiver, Sender
-from frequenz.client.microgrid import ComponentCategory, ComponentId, InverterType
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory, InverterType
 
 from ..._internal._channels import ChannelRegistry, ReceiverFetcher
 from ...microgrid import connection_manager
diff --git a/src/frequenz/sdk/timeseries/pv_pool/_system_bounds_tracker.py b/src/frequenz/sdk/timeseries/pv_pool/_system_bounds_tracker.py
index b02e88ad8..ed8a267e0 100644
--- a/src/frequenz/sdk/timeseries/pv_pool/_system_bounds_tracker.py
+++ b/src/frequenz/sdk/timeseries/pv_pool/_system_bounds_tracker.py
@@ -7,7 +7,8 @@
 from collections import abc
 
 from frequenz.channels import Receiver, Sender, merge, select, selected_from
-from frequenz.client.microgrid import ComponentId, InverterData
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import InverterData
 from frequenz.quantities import Power
 
 from ..._internal._asyncio import run_forever
diff --git a/tests/actor/_power_managing/test_matryoshka.py b/tests/actor/_power_managing/test_matryoshka.py
index ef1196eec..155e51815 100644
--- a/tests/actor/_power_managing/test_matryoshka.py
+++ b/tests/actor/_power_managing/test_matryoshka.py
@@ -8,7 +8,7 @@
 from datetime import datetime, timedelta, timezone
 
 import pytest
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Power
 
 from frequenz.sdk import timeseries
diff --git a/tests/actor/_power_managing/test_shifting_matryoshka.py b/tests/actor/_power_managing/test_shifting_matryoshka.py
index 724faac1c..897deb392 100644
--- a/tests/actor/_power_managing/test_shifting_matryoshka.py
+++ b/tests/actor/_power_managing/test_shifting_matryoshka.py
@@ -10,7 +10,7 @@
 from datetime import datetime, timedelta, timezone
 
 import pytest
-from frequenz.client.microgrid import ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.quantities import Power
 
 from frequenz.sdk import timeseries
diff --git a/tests/actor/test_resampling.py b/tests/actor/test_resampling.py
index b5af4ef57..587f72568 100644
--- a/tests/actor/test_resampling.py
+++ b/tests/actor/test_resampling.py
@@ -10,7 +10,8 @@
 import pytest
 import time_machine
 from frequenz.channels import Broadcast
-from frequenz.client.microgrid import ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentMetricId
 from frequenz.quantities import Quantity
 
 from frequenz.sdk._internal._channels import ChannelRegistry
diff --git a/tests/microgrid/power_distributing/_component_status/test_battery_pool_status.py b/tests/microgrid/power_distributing/_component_status/test_battery_pool_status.py
index 99aa395ef..95db1494b 100644
--- a/tests/microgrid/power_distributing/_component_status/test_battery_pool_status.py
+++ b/tests/microgrid/power_distributing/_component_status/test_battery_pool_status.py
@@ -6,7 +6,8 @@
 from datetime import timedelta
 
 from frequenz.channels import Broadcast
-from frequenz.client.microgrid import ComponentCategory, ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory
 from pytest_mock import MockerFixture
 
 from frequenz.sdk.microgrid._power_distributing._component_pool_status_tracker import (
diff --git a/tests/microgrid/power_distributing/_component_status/test_battery_status.py b/tests/microgrid/power_distributing/_component_status/test_battery_status.py
index 90951e3f9..eeb7ff2ef 100644
--- a/tests/microgrid/power_distributing/_component_status/test_battery_status.py
+++ b/tests/microgrid/power_distributing/_component_status/test_battery_status.py
@@ -15,13 +15,13 @@
 import async_solipsism
 import pytest
 from frequenz.channels import Broadcast, Receiver
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     BatteryComponentState,
     BatteryData,
     BatteryError,
     BatteryErrorCode,
     BatteryRelayState,
-    ComponentId,
     ErrorLevel,
     InverterComponentState,
     InverterData,
diff --git a/tests/microgrid/power_distributing/_component_status/test_ev_charger_status.py b/tests/microgrid/power_distributing/_component_status/test_ev_charger_status.py
index 6f7e586c5..14dcb6e6e 100644
--- a/tests/microgrid/power_distributing/_component_status/test_ev_charger_status.py
+++ b/tests/microgrid/power_distributing/_component_status/test_ev_charger_status.py
@@ -7,11 +7,8 @@
 from datetime import datetime, timedelta, timezone
 
 from frequenz.channels import Broadcast
-from frequenz.client.microgrid import (
-    ComponentId,
-    EVChargerCableState,
-    EVChargerComponentState,
-)
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import EVChargerCableState, EVChargerComponentState
 from pytest_mock import MockerFixture
 
 from frequenz.sdk._internal._asyncio import cancel_and_await
diff --git a/tests/microgrid/power_distributing/_component_status/test_pv_inverter_status.py b/tests/microgrid/power_distributing/_component_status/test_pv_inverter_status.py
index c77a4af0a..aa85bd044 100644
--- a/tests/microgrid/power_distributing/_component_status/test_pv_inverter_status.py
+++ b/tests/microgrid/power_distributing/_component_status/test_pv_inverter_status.py
@@ -8,7 +8,8 @@
 from datetime import datetime, timedelta, timezone
 
 from frequenz.channels import Broadcast
-from frequenz.client.microgrid import ComponentId, InverterComponentState
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import InverterComponentState
 from pytest_mock import MockerFixture
 
 from frequenz.sdk._internal._asyncio import cancel_and_await
diff --git a/tests/microgrid/power_distributing/test_battery_distribution_algorithm.py b/tests/microgrid/power_distributing/test_battery_distribution_algorithm.py
index 6cad62c9f..16a3949f0 100644
--- a/tests/microgrid/power_distributing/test_battery_distribution_algorithm.py
+++ b/tests/microgrid/power_distributing/test_battery_distribution_algorithm.py
@@ -8,7 +8,8 @@
 from dataclasses import dataclass
 from datetime import datetime, timezone
 
-from frequenz.client.microgrid import BatteryData, ComponentId, InverterData
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import BatteryData, InverterData
 from frequenz.quantities import Power
 from pytest import approx, raises
 
diff --git a/tests/microgrid/power_distributing/test_power_distributing.py b/tests/microgrid/power_distributing/test_power_distributing.py
index e36d3f969..3ee490631 100644
--- a/tests/microgrid/power_distributing/test_power_distributing.py
+++ b/tests/microgrid/power_distributing/test_power_distributing.py
@@ -12,7 +12,8 @@
 from unittest.mock import MagicMock
 
 from frequenz.channels import Broadcast
-from frequenz.client.microgrid import ComponentCategory, ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory
 from frequenz.quantities import Power
 from pytest_mock import MockerFixture
 
diff --git a/tests/microgrid/test_data_sourcing.py b/tests/microgrid/test_data_sourcing.py
index 01ba35f9e..02f94fcbe 100644
--- a/tests/microgrid/test_data_sourcing.py
+++ b/tests/microgrid/test_data_sourcing.py
@@ -12,6 +12,7 @@
 import pytest
 import pytest_mock
 from frequenz.channels import Broadcast
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     BatteryComponentState,
     BatteryData,
@@ -19,7 +20,6 @@
     Component,
     ComponentCategory,
     ComponentData,
-    ComponentId,
     ComponentMetricId,
     EVChargerCableState,
     EVChargerComponentState,
diff --git a/tests/microgrid/test_datapipeline.py b/tests/microgrid/test_datapipeline.py
index b0ee32e2f..e9e688571 100644
--- a/tests/microgrid/test_datapipeline.py
+++ b/tests/microgrid/test_datapipeline.py
@@ -9,10 +9,10 @@
 import async_solipsism
 import pytest
 import time_machine
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     Component,
     ComponentCategory,
-    ComponentId,
     Connection,
     InverterType,
 )
diff --git a/tests/microgrid/test_graph.py b/tests/microgrid/test_graph.py
index 7347e1e18..b25432803 100644
--- a/tests/microgrid/test_graph.py
+++ b/tests/microgrid/test_graph.py
@@ -10,10 +10,10 @@
 from unittest import mock
 
 import pytest
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     Component,
     ComponentCategory,
-    ComponentId,
     ComponentMetadata,
     Connection,
     Fuse,
diff --git a/tests/microgrid/test_grid.py b/tests/microgrid/test_grid.py
index 1f847f711..c72029c3b 100644
--- a/tests/microgrid/test_grid.py
+++ b/tests/microgrid/test_grid.py
@@ -6,7 +6,8 @@
 from contextlib import AsyncExitStack
 
 import frequenz.client.microgrid as client
-from frequenz.client.microgrid import ComponentCategory, ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory
 from frequenz.quantities import Current, Power, Quantity, ReactivePower
 from pytest_mock import MockerFixture
 
diff --git a/tests/microgrid/test_microgrid_api.py b/tests/microgrid/test_microgrid_api.py
index dd7ffc61f..51a10e811 100644
--- a/tests/microgrid/test_microgrid_api.py
+++ b/tests/microgrid/test_microgrid_api.py
@@ -10,14 +10,14 @@
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
+from frequenz.client.common.microgrid import MicrogridId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     Component,
     ComponentCategory,
-    ComponentId,
     Connection,
     Location,
     Metadata,
-    MicrogridId,
 )
 
 from frequenz.sdk.microgrid import connection_manager
diff --git a/tests/timeseries/_battery_pool/test_battery_pool.py b/tests/timeseries/_battery_pool/test_battery_pool.py
index e41db0868..2da4f0585 100644
--- a/tests/timeseries/_battery_pool/test_battery_pool.py
+++ b/tests/timeseries/_battery_pool/test_battery_pool.py
@@ -20,7 +20,8 @@
 import pytest
 import time_machine
 from frequenz.channels import Receiver, Sender
-from frequenz.client.microgrid import ComponentCategory, ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentCategory
 from frequenz.quantities import Energy, Percentage, Power, Temperature
 from pytest_mock import MockerFixture
 
diff --git a/tests/timeseries/_formula_engine/utils.py b/tests/timeseries/_formula_engine/utils.py
index a3bae95d3..6713ee4b7 100644
--- a/tests/timeseries/_formula_engine/utils.py
+++ b/tests/timeseries/_formula_engine/utils.py
@@ -8,7 +8,8 @@
 from math import isclose
 
 from frequenz.channels import Receiver
-from frequenz.client.microgrid import ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentMetricId
 
 from frequenz.sdk.microgrid import _data_pipeline
 from frequenz.sdk.timeseries._base_types import QuantityT, Sample
diff --git a/tests/timeseries/_pv_pool/test_pv_pool_control_methods.py b/tests/timeseries/_pv_pool/test_pv_pool_control_methods.py
index e1ef9141f..89f29c808 100644
--- a/tests/timeseries/_pv_pool/test_pv_pool_control_methods.py
+++ b/tests/timeseries/_pv_pool/test_pv_pool_control_methods.py
@@ -11,7 +11,8 @@
 import async_solipsism
 import pytest
 from frequenz.channels import Receiver
-from frequenz.client.microgrid import ComponentId, InverterComponentState
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import InverterComponentState
 from frequenz.quantities import Power
 from pytest_mock import MockerFixture
 
diff --git a/tests/timeseries/mock_microgrid.py b/tests/timeseries/mock_microgrid.py
index 20b9abc7b..48ce6fd69 100644
--- a/tests/timeseries/mock_microgrid.py
+++ b/tests/timeseries/mock_microgrid.py
@@ -10,11 +10,11 @@
 from datetime import datetime, timedelta, timezone
 from typing import Coroutine
 
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     Component,
     ComponentCategory,
     ComponentData,
-    ComponentId,
     Connection,
     EVChargerCableState,
     EVChargerComponentState,
diff --git a/tests/timeseries/mock_resampler.py b/tests/timeseries/mock_resampler.py
index e2f640be2..ce4cc59b7 100644
--- a/tests/timeseries/mock_resampler.py
+++ b/tests/timeseries/mock_resampler.py
@@ -9,7 +9,8 @@
 from datetime import datetime
 
 from frequenz.channels import Broadcast, Receiver, Sender
-from frequenz.client.microgrid import ComponentId, ComponentMetricId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentMetricId
 from frequenz.quantities import Quantity
 from pytest_mock import MockerFixture
 
diff --git a/tests/timeseries/test_formula_formatter.py b/tests/timeseries/test_formula_formatter.py
index f95c4ab3b..b7b736cb5 100644
--- a/tests/timeseries/test_formula_formatter.py
+++ b/tests/timeseries/test_formula_formatter.py
@@ -8,9 +8,7 @@
 from frequenz.quantities import Quantity
 
 from frequenz.sdk.timeseries import Sample
-from frequenz.sdk.timeseries.formula_engine._formula_engine import (
-    FormulaBuilder,
-)
+from frequenz.sdk.timeseries.formula_engine._formula_engine import FormulaBuilder
 from frequenz.sdk.timeseries.formula_engine._formula_formatter import format_formula
 from frequenz.sdk.timeseries.formula_engine._formula_steps import (
     Clipper,
diff --git a/tests/utils/component_data_streamer.py b/tests/utils/component_data_streamer.py
index a2ac218c4..b23fc1e7a 100644
--- a/tests/utils/component_data_streamer.py
+++ b/tests/utils/component_data_streamer.py
@@ -8,7 +8,8 @@
 from dataclasses import replace
 from datetime import datetime, timezone
 
-from frequenz.client.microgrid import ComponentData, ComponentId
+from frequenz.client.common.microgrid.components import ComponentId
+from frequenz.client.microgrid import ComponentData
 
 from frequenz.sdk._internal._asyncio import cancel_and_await
 
diff --git a/tests/utils/component_data_wrapper.py b/tests/utils/component_data_wrapper.py
index 275f4a6b1..324b6075b 100644
--- a/tests/utils/component_data_wrapper.py
+++ b/tests/utils/component_data_wrapper.py
@@ -16,12 +16,12 @@
 from dataclasses import dataclass, replace
 from datetime import datetime
 
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     BatteryComponentState,
     BatteryData,
     BatteryError,
     BatteryRelayState,
-    ComponentId,
     EVChargerCableState,
     EVChargerComponentState,
     EVChargerData,
diff --git a/tests/utils/component_graph_utils.py b/tests/utils/component_graph_utils.py
index 7e3cd81a8..e4aab76c6 100644
--- a/tests/utils/component_graph_utils.py
+++ b/tests/utils/component_graph_utils.py
@@ -6,10 +6,10 @@
 
 from dataclasses import dataclass
 
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     Component,
     ComponentCategory,
-    ComponentId,
     Connection,
     InverterType,
 )
diff --git a/tests/utils/graph_generator.py b/tests/utils/graph_generator.py
index 9bbd6dc93..0d7d5b59c 100644
--- a/tests/utils/graph_generator.py
+++ b/tests/utils/graph_generator.py
@@ -6,10 +6,10 @@
 from dataclasses import replace
 from typing import Any, overload
 
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     Component,
     ComponentCategory,
-    ComponentId,
     ComponentType,
     Connection,
     GridMetadata,
diff --git a/tests/utils/mock_microgrid_client.py b/tests/utils/mock_microgrid_client.py
index efea6ce07..6715380ef 100644
--- a/tests/utils/mock_microgrid_client.py
+++ b/tests/utils/mock_microgrid_client.py
@@ -7,18 +7,18 @@
 from unittest.mock import AsyncMock, MagicMock
 
 from frequenz.channels import Broadcast, Receiver
+from frequenz.client.common.microgrid import MicrogridId
+from frequenz.client.common.microgrid.components import ComponentId
 from frequenz.client.microgrid import (
     BatteryData,
     Component,
     ComponentCategory,
     ComponentData,
-    ComponentId,
     Connection,
     EVChargerData,
     InverterData,
     Location,
     MeterData,
-    MicrogridId,
 )
 from pytest_mock import MockerFixture