diff --git a/test/simulator/meson.build b/test/simulator/meson.build
index ec5410f..590e381 100644
--- a/test/simulator/meson.build
+++ b/test/simulator/meson.build
@@ -1,12 +1,12 @@
 # Simulator sources
-sim_libhei = [
+sim_src = [
     'simulator.cpp',
-    'hei_user_interface.cpp',
-    '../hei_user_defines.cpp'
+    'sim_hardware_access.cpp',
+    '../sim_tracing.cpp'
 ]
 
 # Test cases
-test_libhei = [
+test_src = [
     'sample_test_case.cpp',
 ]
 
@@ -15,7 +15,7 @@
 # Build simulator linked locally
 if gtest.found()
     test('simulator',
-         executable('simulator', sim_libhei, test_libhei,
+         executable('simulator', sim_src, test_src,
                     dependencies : gtest,
                     link_with : libhei_static,
                     include_directories: incdir))
diff --git a/test/simulator/hei_user_interface.cpp b/test/simulator/sim_hardware_access.cpp
similarity index 100%
rename from test/simulator/hei_user_interface.cpp
rename to test/simulator/sim_hardware_access.cpp