diff --git a/gns3server/compute/base_node.py b/gns3server/compute/base_node.py
index 918342c2..fe771b2b 100644
--- a/gns3server/compute/base_node.py
+++ b/gns3server/compute/base_node.py
@@ -105,7 +105,7 @@ class BaseNode:
     def status(self, status):
 
         self._node_status = status
-        self._project.emit("node.{}".format(status), self)
+        self._project.emit("node.updated", self)
 
     @property
     def command_line(self):
diff --git a/tests/compute/qemu/test_qemu_vm.py b/tests/compute/qemu/test_qemu_vm.py
index 582f9c3d..efa90403 100644
--- a/tests/compute/qemu/test_qemu_vm.py
+++ b/tests/compute/qemu/test_qemu_vm.py
@@ -148,7 +148,7 @@ def test_termination_callback(vm, async_run):
         async_run(queue.get(0))  #  Ping
 
         (action, event, kwargs) = async_run(queue.get(0))
-        assert action == "node.stopped"
+        assert action == "node.updated"
         assert event == vm
 
 
@@ -167,7 +167,7 @@ def test_termination_callback_error(vm, tmpdir, async_run):
         async_run(queue.get(0))  #  Ping
 
         (action, event, kwargs) = queue.get_nowait()
-        assert action == "node.stopped"
+        assert action == "node.updated"
         assert event == vm
 
         (action, event, kwargs) = queue.get_nowait()
diff --git a/tests/compute/vpcs/test_vpcs_vm.py b/tests/compute/vpcs/test_vpcs_vm.py
index f1db4365..2e3cb2d7 100644
--- a/tests/compute/vpcs/test_vpcs_vm.py
+++ b/tests/compute/vpcs/test_vpcs_vm.py
@@ -112,7 +112,7 @@ def test_start(loop, vm, async_run):
                 assert vm.is_running()
                 assert vm.command_line == ' '.join(mock_exec.call_args[0])
         (action, event, kwargs) = async_run(queue.get(0))
-        assert action == "node.started"
+        assert action == "node.updated"
         assert event == vm
 
 
@@ -177,7 +177,7 @@ def test_stop(loop, vm, async_run):
                 async_run(queue.get(0))  #  Started
 
                 (action, event, kwargs) = async_run(queue.get(0))
-                assert action == "node.stopped"
+                assert action == "node.updated"
                 assert event == vm