diff --git a/src/libdramsys/CMakeLists.txt b/src/libdramsys/CMakeLists.txt
index 28be9a5a..3ae1067f 100644
--- a/src/libdramsys/CMakeLists.txt
+++ b/src/libdramsys/CMakeLists.txt
@@ -107,7 +107,7 @@ target_link_libraries(libdramsys
     PUBLIC
         SystemC::systemc
         DRAMSys::config
-        $<$<TARGET_EXISTS:DRAMPower>:DRAMPower>
+        $<$<TARGET_EXISTS:DRAMPower>:DRAMSys::DRAMPower>
     PRIVATE
         SQLite::SQLite3
 
diff --git a/src/simulator/CMakeLists.txt b/src/simulator/CMakeLists.txt
index e5cc6722..b218184a 100644
--- a/src/simulator/CMakeLists.txt
+++ b/src/simulator/CMakeLists.txt
@@ -61,7 +61,7 @@ target_include_directories(simulator
 
 target_link_libraries(simulator
     PUBLIC
-        libdramsys
+        DRAMSys::libdramsys
     PRIVATE
         Threads::Threads
 )
@@ -74,5 +74,5 @@ add_executable(DRAMSys
 
 target_link_libraries(DRAMSys
     PRIVATE
-        simulator
+        DRAMSys::simulator
 )
diff --git a/tests/tests_dramsys/CMakeLists.txt b/tests/tests_dramsys/CMakeLists.txt
index dba79007..e2b70a28 100644
--- a/tests/tests_dramsys/CMakeLists.txt
+++ b/tests/tests_dramsys/CMakeLists.txt
@@ -10,7 +10,7 @@ add_executable(tests_dramsys
     test_utils.cpp
 )
 
-target_include_directories(tests_dramsys PUBLIC ${PROJECT_SOURCE_DIR})
+target_include_directories(tests_dramsys PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 set_target_properties(tests_dramsys PROPERTIES FOLDER tests)
 target_link_libraries(tests_dramsys 
     DRAMSys::libdramsys
diff --git a/tests/tests_simulator/CMakeLists.txt b/tests/tests_simulator/CMakeLists.txt
index ded10b12..9841e539 100644
--- a/tests/tests_simulator/CMakeLists.txt
+++ b/tests/tests_simulator/CMakeLists.txt
@@ -10,9 +10,9 @@ add_executable(tests_simulator
 )
 
 set_target_properties(tests_simulator PROPERTIES FOLDER tests/simulator)
-
+target_include_directories(tests_simulator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(tests_simulator PRIVATE
-    simulator
+    DRAMSys::simulator
     gtest
     gtest_main
 )