diff --git a/ophyd_devices/sim/sim.py b/ophyd_devices/sim/sim.py
index d0ac457..f399461 100644
--- a/ophyd_devices/sim/sim.py
+++ b/ophyd_devices/sim/sim.py
@@ -3,7 +3,9 @@ import threading
 import time as ttime
 
 import numpy as np
-from bec_lib import MessageEndpoints, bec_logger, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
+from bec_lib.logger import bec_logger
 from ophyd import Component as Cpt
 from ophyd import Device, DeviceStatus
 from ophyd import DynamicDeviceComponent as Dcpt
diff --git a/ophyd_devices/sim/sim_test_devices.py b/ophyd_devices/sim/sim_test_devices.py
index 7d30128..2be5e16 100644
--- a/ophyd_devices/sim/sim_test_devices.py
+++ b/ophyd_devices/sim/sim_test_devices.py
@@ -2,7 +2,8 @@ import threading
 import time as ttime
 
 import numpy as np
-from bec_lib import MessageEndpoints, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
 from ophyd import Device, OphydObject, PositionerBase
 
 
diff --git a/ophyd_devices/sim/sim_xtreme.py b/ophyd_devices/sim/sim_xtreme.py
index 3e94647..41fed5d 100644
--- a/ophyd_devices/sim/sim_xtreme.py
+++ b/ophyd_devices/sim/sim_xtreme.py
@@ -2,7 +2,8 @@ import threading
 import time
 
 import numpy as np
-from bec_lib import MessageEndpoints, messages
+from bec_lib import messages
+from bec_lib.endpoints import MessageEndpoints
 from ophyd import Component as Cpt
 from ophyd import Device, Kind, Signal
 from ophyd.flyers import FlyerInterface
diff --git a/ophyd_devices/utils/bec_scaninfo_mixin.py b/ophyd_devices/utils/bec_scaninfo_mixin.py
index e190b2c..d7d6fab 100644
--- a/ophyd_devices/utils/bec_scaninfo_mixin.py
+++ b/ophyd_devices/utils/bec_scaninfo_mixin.py
@@ -1,6 +1,8 @@
 import getpass
 
-from bec_lib import DeviceManagerBase, MessageEndpoints, bec_logger, messages
+from bec_lib import bec_logger, messages
+from bec_lib.devicemanager import DeviceManagerBase
+from bec_lib.endpoints import MessageEndpoints
 
 logger = bec_logger.logger