diff --git a/bec_widgets/examples/modular_app/modular.ui b/bec_widgets/examples/modular_app/modular.ui
index 265c0fd2..57bab5fc 100644
--- a/bec_widgets/examples/modular_app/modular.ui
+++ b/bec_widgets/examples/modular_app/modular.ui
@@ -23,7 +23,7 @@
      </widget>
     </item>
     <item row="3" column="0" colspan="2">
-     <widget class="BECDeviceMonitor" name="plot_1"/>
+     <widget class="BECMonitor" name="plot_1"/>
     </item>
     <item row="1" column="3">
      <widget class="QPushButton" name="pushButton_setting_2">
@@ -33,7 +33,7 @@
      </widget>
     </item>
     <item row="3" column="2" colspan="2">
-     <widget class="BECDeviceMonitor" name="plot_2"/>
+     <widget class="BECMonitor" name="plot_2"/>
     </item>
     <item row="1" column="4">
      <widget class="QLabel" name="label_2">
@@ -64,7 +64,7 @@
      </widget>
     </item>
     <item row="3" column="4" colspan="2">
-     <widget class="BECDeviceMonitor" name="plot_3"/>
+     <widget class="BECMonitor" name="plot_3"/>
     </item>
    </layout>
   </widget>
@@ -82,7 +82,7 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>BECDeviceMonitor</class>
+   <class>BECMonitor</class>
    <extends>QGraphicsView</extends>
    <header location="global">bec_widgets.widgets.h</header>
   </customwidget>
diff --git a/bec_widgets/examples/modular_app/modular_app.py b/bec_widgets/examples/modular_app/modular_app.py
index cacf90a1..2793d9dc 100644
--- a/bec_widgets/examples/modular_app/modular_app.py
+++ b/bec_widgets/examples/modular_app/modular_app.py
@@ -3,7 +3,7 @@ import os
 from PyQt5 import uic
 from PyQt5.QtWidgets import QMainWindow, QApplication, QVBoxLayout
 
-from bec_widgets.widgets.monitor import BECDeviceMonitor
+from bec_widgets.widgets.monitor import BECMonitor
 
 # some default configs for demonstration purposes
 config_1 = {
diff --git a/bec_widgets/widgets/__init__.py b/bec_widgets/widgets/__init__.py
index 804bdf32..23ec8073 100644
--- a/bec_widgets/widgets/__init__.py
+++ b/bec_widgets/widgets/__init__.py
@@ -1 +1 @@
-from .monitor import BECDeviceMonitor
+from .monitor import BECDeviceMonitor, ConfigDialog
diff --git a/bec_widgets/widgets/monitor/__init__.py b/bec_widgets/widgets/monitor/__init__.py
index 1b2791a1..49161f1a 100644
--- a/bec_widgets/widgets/monitor/__init__.py
+++ b/bec_widgets/widgets/monitor/__init__.py
@@ -1,2 +1,2 @@
-from .device_monitor import BECDeviceMonitor
+from .monitor import BECMonitor
 from .config_dialog import ConfigDialog
diff --git a/bec_widgets/widgets/monitor/device_monitor.py b/bec_widgets/widgets/monitor/monitor.py
similarity index 99%
rename from bec_widgets/widgets/monitor/device_monitor.py
rename to bec_widgets/widgets/monitor/monitor.py
index 80d86a92..91e6a2a2 100644
--- a/bec_widgets/widgets/monitor/device_monitor.py
+++ b/bec_widgets/widgets/monitor/monitor.py
@@ -46,13 +46,13 @@ config_simple = {
 }
 
 
-class BECDeviceMonitor(pg.GraphicsLayoutWidget):
+class BECMonitor(pg.GraphicsLayoutWidget):
     update_signal = pyqtSignal()
 
     def __init__(
         self, parent=None, client=None, config: dict = None, enable_crosshair: bool = False
     ):
-        super(BECDeviceMonitor, self).__init__(parent=parent)
+        super(BECMonitor, self).__init__(parent=parent)
 
         # Client and device manager from BEC
         self.client = bec_dispatcher.client if client is None else client
@@ -392,6 +392,6 @@ if __name__ == "__main__":
     client.start()
 
     app = QApplication(sys.argv)
-    monitor = BECDeviceMonitor()
+    monitor = BECMonitor()
     monitor.show()
     sys.exit(app.exec_())
diff --git a/tests/test_bec_device_monitor.py b/tests/test_bec_monitor.py
similarity index 97%
rename from tests/test_bec_device_monitor.py
rename to tests/test_bec_monitor.py
index 24d763e8..32235006 100644
--- a/tests/test_bec_device_monitor.py
+++ b/tests/test_bec_monitor.py
@@ -3,7 +3,7 @@ from unittest.mock import MagicMock
 import pytest
 from PyQt5.QtWidgets import QApplication
 
-from bec_widgets.widgets import BECDeviceMonitor
+from bec_widgets.widgets import BECMonitor
 
 config_device = {
     "plot_settings": {
@@ -122,7 +122,7 @@ config_scan = {
 def setup_monitor(qtbot, config):
     """Helper function to set up the BECDeviceMonitor widget."""
     client = MagicMock()
-    widget = BECDeviceMonitor(config=config, client=client)
+    widget = BECMonitor(config=config, client=client)
     qtbot.addWidget(widget)
     qtbot.waitExposed(widget)
     return widget
@@ -149,7 +149,7 @@ def qtbot(app, qtbot):  # TODO is this needed?
 )
 def test_initialization_with_device_config(qtbot, config, scan_type, number_of_plots):
     widget = setup_monitor(qtbot, config)
-    assert isinstance(widget, BECDeviceMonitor)
+    assert isinstance(widget, BECMonitor)
     assert widget.config == config
     assert widget.client is not None
     assert len(widget.plot_data) == number_of_plots