diff --git a/wasp/boards/simulator/test_smoke.py b/wasp/boards/simulator/test_smoke.py
index 50636d0..c9f928b 100644
--- a/wasp/boards/simulator/test_smoke.py
+++ b/wasp/boards/simulator/test_smoke.py
@@ -32,7 +32,7 @@ def test_quick_ring(system):
     names = [ x.NAME for x in system.quick_ring ]
     assert('Clock' in names)
     assert('Steps' in names)
-    assert('Timer' in names)
+    assert('Stopclock' in names)
     assert('Heart' in names)
 
 def test_launcher_ring(system):
@@ -41,7 +41,7 @@ def test_launcher_ring(system):
     assert('Software' in names)
 
 @pytest.mark.parametrize("name",
-        ('Steps', 'Timer', 'Heart', 'Settings', 'Software'))
+        ('Steps', 'Stopclock', 'Heart', 'Settings', 'Software'))
 def test_app(system, name):
     system.switch(system.apps[name])
     for i in range(4):
@@ -73,7 +73,7 @@ def test_constructor(system, constructor):
             raise
 
 def test_stopwatch(system):
-    system.switch(system.apps['Timer'])
+    system.switch(system.apps['Stopclock'])
 
     system.step()