diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d235bb0..0f019bf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
+### Fixed
+- Fix deprecated imports in preparation for qm-qua version 1.2.0
 
 ## [0.17.5] - 2024-06-26
 ### Fixed
diff --git a/examples/callable_from_qua/feedback_on_external_instrument.py b/examples/callable_from_qua/feedback_on_external_instrument.py
index eb314089..ca85c235 100644
--- a/examples/callable_from_qua/feedback_on_external_instrument.py
+++ b/examples/callable_from_qua/feedback_on_external_instrument.py
@@ -1,5 +1,5 @@
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from time import sleep
 from configuration import *
 from qualang_tools.callable_from_qua import *
diff --git a/examples/callable_from_qua/qua_print.py b/examples/callable_from_qua/qua_print.py
index 947248a3..56a411eb 100644
--- a/examples/callable_from_qua/qua_print.py
+++ b/examples/callable_from_qua/qua_print.py
@@ -1,5 +1,5 @@
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from configuration import *
 from qualang_tools.callable_from_qua import callable_from_qua, patch_qua_program_addons
 
diff --git a/examples/callable_from_qua/update_other_instruments.py b/examples/callable_from_qua/update_other_instruments.py
index bafde26a..ffff6220 100644
--- a/examples/callable_from_qua/update_other_instruments.py
+++ b/examples/callable_from_qua/update_other_instruments.py
@@ -1,5 +1,5 @@
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from configuration import *
 from qualang_tools.callable_from_qua import *
 from qualang_tools.loops import from_array
diff --git a/qualang_tools/addons/calibration/README.md b/qualang_tools/addons/calibration/README.md
index 0fc49b27..54e48a3a 100644
--- a/qualang_tools/addons/calibration/README.md
+++ b/qualang_tools/addons/calibration/README.md
@@ -30,7 +30,7 @@ Several options are also available for customizing the plots. All of them are wr
 
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qualang_tools.addons.calibration.calibrations import *
 from configuration import * 
 
diff --git a/qualang_tools/addons/calibration/calibrations.py b/qualang_tools/addons/calibration/calibrations.py
index 932da19d..52f9370f 100644
--- a/qualang_tools/addons/calibration/calibrations.py
+++ b/qualang_tools/addons/calibration/calibrations.py
@@ -3,8 +3,8 @@
 """
 
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
-from qm.QuantumMachine import QuantumMachine
+from qm import QuantumMachinesManager
+from qm import QuantumMachine
 from qualang_tools.plot import interrupt_on_close
 from qualang_tools.results import progress_counter, fetching_tool
 from qualang_tools.units import unit
diff --git a/qualang_tools/callable_from_qua/_callable_from_qua.py b/qualang_tools/callable_from_qua/_callable_from_qua.py
index 479ce827..760366eb 100644
--- a/qualang_tools/callable_from_qua/_callable_from_qua.py
+++ b/qualang_tools/callable_from_qua/_callable_from_qua.py
@@ -3,11 +3,11 @@
 from time import sleep
 from typing import List, Any, Dict
 from functools import wraps
-from qm.QmJob import QmJob
+from qm import QmJob
 from qm.program import Program
 from qm.qua import declare_stream, save, pause
 from qm.exceptions import QmQuaException
-from qm.QuantumMachine import QuantumMachine
+from qm import QuantumMachine
 from qm.qua._dsl import _ResultSource, _Variable, align, _get_root_program_scope
 
 __all__ = ["ProgramAddon", "callable_from_qua"]
diff --git a/qualang_tools/callable_from_qua/_qua_patches.py b/qualang_tools/callable_from_qua/_qua_patches.py
index 45cb4f23..9334b74b 100644
--- a/qualang_tools/callable_from_qua/_qua_patches.py
+++ b/qualang_tools/callable_from_qua/_qua_patches.py
@@ -5,7 +5,7 @@
 
 from qm.program import Program
 from qm.qua._dsl import _ProgramScope as _ProgramScope_qua
-from qm.QuantumMachine import QuantumMachine
+from qm import QuantumMachine
 from qm.simulate.interface import SimulationConfig
 
 
diff --git a/qualang_tools/control_panel/manual_output_control.py b/qualang_tools/control_panel/manual_output_control.py
index 9e18b673..15134af9 100644
--- a/qualang_tools/control_panel/manual_output_control.py
+++ b/qualang_tools/control_panel/manual_output_control.py
@@ -6,8 +6,8 @@
 
 import numpy as np
 from qm import QuantumMachine
-from qm.QmJob import QmJob
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QmJob
+from qm import QuantumMachinesManager
 from qm.qua import *
 
 
diff --git a/qualang_tools/control_panel/vna.py b/qualang_tools/control_panel/vna.py
index 71e6625f..96ade04e 100644
--- a/qualang_tools/control_panel/vna.py
+++ b/qualang_tools/control_panel/vna.py
@@ -1,7 +1,7 @@
 """calling function libraries"""
 
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 import numpy as np
 import matplotlib.pyplot as plt
 
diff --git a/qualang_tools/external_frameworks/qcodes/opx_driver.py b/qualang_tools/external_frameworks/qcodes/opx_driver.py
index eca32f58..a68965bf 100644
--- a/qualang_tools/external_frameworks/qcodes/opx_driver.py
+++ b/qualang_tools/external_frameworks/qcodes/opx_driver.py
@@ -9,7 +9,7 @@
 from qcodes.utils.validators import Numbers, Arrays
 from qm import SimulationConfig, generate_qua_script
 from qm.qua import program
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qualang_tools.results import wait_until_job_is_paused
 from qualang_tools.results import fetching_tool
 from qualang_tools.plot import interrupt_on_close
diff --git a/qualang_tools/multi_user/README.md b/qualang_tools/multi_user/README.md
index 7645e14f..f03e8c66 100644
--- a/qualang_tools/multi_user/README.md
+++ b/qualang_tools/multi_user/README.md
@@ -17,8 +17,8 @@ for another user.
 Note: `host`, `config` and `prog` are assumed to be supplied by user.
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
-from qm.QmJob import QmJob
+from qm import QuantumMachinesManager
+from qm import QmJob
 from qualang_tools.multi_user import qm_session
 qmm = QuantumMachinesManager(host)
 
diff --git a/qualang_tools/multi_user/multi_user_tools.py b/qualang_tools/multi_user/multi_user_tools.py
index a701e83f..94c3acb0 100644
--- a/qualang_tools/multi_user/multi_user_tools.py
+++ b/qualang_tools/multi_user/multi_user_tools.py
@@ -3,7 +3,7 @@
 from time import sleep
 
 from qm import QuantumMachine
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 
 msg = (
     "A quantum machine cannot be opened because an existing quantum machine, using the same ports, is currently "
diff --git a/qualang_tools/octave_tools/octave_tools.py b/qualang_tools/octave_tools/octave_tools.py
index 9792139f..b1ad6604 100644
--- a/qualang_tools/octave_tools/octave_tools.py
+++ b/qualang_tools/octave_tools/octave_tools.py
@@ -1,9 +1,9 @@
 import numpy as np
 from qm.octave.calibration_db import CalibrationDB
 from typing import Union
-from qm.QmJob import QmJob
+from qm import QmJob
 from qm.jobs.running_qm_job import RunningQmJob
-from qm.QuantumMachine import QuantumMachine
+from qm import QuantumMachine
 from qm.octave.octave_mixer_calibration import AutoCalibrationParams
 
 
diff --git a/qualang_tools/plot/README.md b/qualang_tools/plot/README.md
index a669bad4..bd37828a 100644
--- a/qualang_tools/plot/README.md
+++ b/qualang_tools/plot/README.md
@@ -7,7 +7,7 @@ This function allows to interrupt the execution and free the console when closin
 ### Usage example
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qualang_tools.plot import interrupt_on_close
 from qm.qua import *
 import matplotlib.pyplot as plt
@@ -56,7 +56,7 @@ This function gets the samples generated from the QUA simulator by element.
 ### Usage example
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qm import SimulationConfig
 from qm.qua import *
 from configuration import config
@@ -80,7 +80,7 @@ This function plots the samples generated from the QUA simulator by element usin
 ### Usage example
 
 ```python
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qm import SimulationConfig
 from qm.qua import *
 from configuration import config
diff --git a/qualang_tools/plot/plot.py b/qualang_tools/plot/plot.py
index 7c683f0f..87e06f26 100644
--- a/qualang_tools/plot/plot.py
+++ b/qualang_tools/plot/plot.py
@@ -9,7 +9,7 @@
 from scipy import signal
 import plotly.graph_objects as go
 from matplotlib import pyplot as plt
-from qm.QmJob import QmJob
+from qm import QmJob
 from qualang_tools.plot.fitting import *
 
 
diff --git a/tests_against_server/test_bakery_server.py b/tests_against_server/test_bakery_server.py
index f20d2e71..3c334d39 100644
--- a/tests_against_server/test_bakery_server.py
+++ b/tests_against_server/test_bakery_server.py
@@ -1,7 +1,7 @@
 import matplotlib.pyplot as plt
 import pytest
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from qm import SimulationConfig
 import numpy as np
 from qualang_tools.bakery.bakery import baking
diff --git a/tests_against_server/test_loops.py b/tests_against_server/test_loops.py
index 2c5d04e7..70b88c8b 100644
--- a/tests_against_server/test_loops.py
+++ b/tests_against_server/test_loops.py
@@ -1,7 +1,7 @@
 import pytest
 from qualang_tools.loops import *
 from qm.qua import *
-from qm.QuantumMachinesManager import QuantumMachinesManager
+from qm import QuantumMachinesManager
 from copy import deepcopy
 import numpy as np
 
diff --git a/tests_against_server/test_multi_user.py b/tests_against_server/test_multi_user.py
index 18867249..afe3a0b5 100644
--- a/tests_against_server/test_multi_user.py
+++ b/tests_against_server/test_multi_user.py
@@ -1,7 +1,7 @@
 import pytest
 import numpy as np
-from qm.QuantumMachinesManager import QuantumMachinesManager
-from qm.QmJob import QmJob
+from qm import QuantumMachinesManager
+from qm import QmJob
 from qm.qua import *
 from qualang_tools.multi_user import qm_session