diff --git a/bec_widgets/examples/extreme/__init__.py b/bec_widgets/examples/crosshair_example/__init__.py
similarity index 100%
rename from bec_widgets/examples/extreme/__init__.py
rename to bec_widgets/examples/crosshair_example/__init__.py
diff --git a/bec_widgets/examples/plotting/crosshair_example.py b/bec_widgets/examples/crosshair_example/crosshair_example.py
similarity index 100%
rename from bec_widgets/examples/plotting/crosshair_example.py
rename to bec_widgets/examples/crosshair_example/crosshair_example.py
diff --git a/bec_widgets/examples/plotting/__init__.py b/bec_widgets/examples/plot_app/__init__.py
similarity index 100%
rename from bec_widgets/examples/plotting/__init__.py
rename to bec_widgets/examples/plot_app/__init__.py
diff --git a/bec_widgets/examples/extreme/config_example.yaml b/bec_widgets/examples/plot_app/config_example.yaml
similarity index 100%
rename from bec_widgets/examples/extreme/config_example.yaml
rename to bec_widgets/examples/plot_app/config_example.yaml
diff --git a/bec_widgets/examples/extreme/config_scans_example.yaml b/bec_widgets/examples/plot_app/config_scans_example.yaml
similarity index 100%
rename from bec_widgets/examples/extreme/config_scans_example.yaml
rename to bec_widgets/examples/plot_app/config_scans_example.yaml
diff --git a/bec_widgets/examples/extreme/extreme.py b/bec_widgets/examples/plot_app/plot_app.py
similarity index 99%
rename from bec_widgets/examples/extreme/extreme.py
rename to bec_widgets/examples/plot_app/plot_app.py
index 053ce067..5e0fe315 100644
--- a/bec_widgets/examples/extreme/extreme.py
+++ b/bec_widgets/examples/plot_app/plot_app.py
@@ -97,7 +97,7 @@ class PlotApp(QWidget):
 
         # Loading UI
         current_path = os.path.dirname(__file__)
-        uic.loadUi(os.path.join(current_path, "extreme.ui"), self)
+        uic.loadUi(os.path.join(current_path, "plot_app.ui"), self)
 
         self.data = {}
 
diff --git a/bec_widgets/examples/extreme/extreme.ui b/bec_widgets/examples/plot_app/plot_app.ui
similarity index 100%
rename from bec_widgets/examples/extreme/extreme.ui
rename to bec_widgets/examples/plot_app/plot_app.ui
diff --git a/tests/test_extreme.py b/tests/test_plot_app.py
similarity index 97%
rename from tests/test_extreme.py
rename to tests/test_plot_app.py
index 5e8d058b..cff37fb0 100644
--- a/tests/test_extreme.py
+++ b/tests/test_plot_app.py
@@ -5,7 +5,7 @@ import pyqtgraph as pg
 import pytest
 from qtpy.QtWidgets import QMessageBox
 
-from bec_widgets.examples.extreme.extreme import PlotApp, ErrorHandler
+from bec_widgets.examples.plot_app.plot_app import PlotApp, ErrorHandler
 
 
 def setup_plot_app(qtbot, config):
@@ -424,7 +424,7 @@ def test_initialization(error_handler):
     assert error_handler.retry_action is None
 
 
-@patch("bec_widgets.examples.extreme.extreme.QMessageBox.critical", return_value=QMessageBox.Retry)
+@patch("bec_widgets.examples.plot_app.plot_app.QMessageBox.critical", return_value=QMessageBox.Retry)
 def test_handle_error_retry(mocked_critical, error_handler):
     retry_action = MagicMock()
     error_handler.set_retry_action(retry_action)
@@ -432,7 +432,7 @@ def test_handle_error_retry(mocked_critical, error_handler):
     retry_action.assert_called_once()
 
 
-@patch("bec_widgets.examples.extreme.extreme.QMessageBox.critical", return_value=QMessageBox.Cancel)
+@patch("bec_widgets.examples.plot_app.plot_app.QMessageBox.critical", return_value=QMessageBox.Cancel)
 def test_handle_error_cancel(mocked_critical, error_handler):
     retry_action = MagicMock()
     with pytest.raises(SystemExit) as excinfo:
@@ -458,7 +458,7 @@ def test_error_handler(error_handler, config, expected_errors):
     error_handler.handle_error = MagicMock()
 
     # Mock logging
-    with unittest.mock.patch("bec_widgets.examples.extreme.extreme.logging") as mocked_logging:
+    with unittest.mock.patch("bec_widgets.examples.plot_app.plot_app.logging") as mocked_logging:
         error_handler.validate_config_file(config)
 
         # Assert