diff --git a/force_bdss/tests/fixtures/test_null.json b/force_bdss/tests/fixtures/test_null.json
index b40385023049b793d3d74b7285135dc42cfadcc2..b5c9ab99b836a09c01b1c196165d73fd59b6f63e 100644
--- a/force_bdss/tests/fixtures/test_null.json
+++ b/force_bdss/tests/fixtures/test_null.json
@@ -2,7 +2,7 @@
   "version": "1",
   "workflow": {
     "mco": {
-      "id": "force.bdss.enthought.plugin.test.v0.factory.test_mco",
+      "id": "force.bdss.enthought.plugin.test.v0.factory.probe_mco",
       "model_data": {
         "parameters" : [
         ]
@@ -11,7 +11,7 @@
     "execution_layers": [
       [
         {
-          "id": "force.bdss.enthought.plugin.test.v0.factory.test_ds",
+          "id": "force.bdss.enthought.plugin.test.v0.factory.probe_data_source",
           "model_data": {
             "input_slot_info": [
             ],
@@ -23,7 +23,7 @@
     ],
     "notification_listeners": [
       {
-        "id": "force.bdss.enthought.plugin.test.v0.factory.test_nl",
+        "id": "force.bdss.enthought.plugin.test.v0.factory.probe_notification_listener",
         "model_data": {
         }
       }
diff --git a/force_bdss/tests/test_core_mco_driver.py b/force_bdss/tests/test_core_mco_driver.py
index c2f2452e642cc9c12c72d0f7059cc57fed6a15df..667c0670a264203747e93222fa696f9bd9d855e5 100644
--- a/force_bdss/tests/test_core_mco_driver.py
+++ b/force_bdss/tests/test_core_mco_driver.py
@@ -92,7 +92,7 @@ class TestCoreMCODriver(unittest.TestCase):
                 ("force_bdss.core_mco_driver",
                  "ERROR",
                  "Failed to create or initialize listener with id "
-                 "force.bdss.enthought.plugin.test.v0.factory.test_nl: "))
+                 "force.bdss.enthought.plugin.test.v0.factory.probe_notification_listener: "))
 
             self.assertEqual(len(listeners), 0)