diff --git a/tests/TestAutomationComRpc/CMakeLists.txt b/tests/TestAutomationComRpc/CMakeLists.txt
index 234c98c5..e62e7759 100644
--- a/tests/TestAutomationComRpc/CMakeLists.txt
+++ b/tests/TestAutomationComRpc/CMakeLists.txt
@@ -19,7 +19,7 @@ project(TestAutomationComRpc)
 
 cmake_minimum_required(VERSION 3.15)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 
diff --git a/tests/TestAutomationComRpc/TestAutomationComRpcPlugin.json b/tests/TestAutomationComRpc/TestAutomationComRpcPlugin.json
index 4f2be1a8..6cfe0621 100644
--- a/tests/TestAutomationComRpc/TestAutomationComRpcPlugin.json
+++ b/tests/TestAutomationComRpc/TestAutomationComRpcPlugin.json
@@ -3,7 +3,7 @@
     "info": {
       "title": "TestAutomationComRpc Plugin",
       "callsign": "TestAutomationComRpc",
-      "locator": "libWPEFrameworkTestAutomationComRpc.so",
+      "locator": "libThunderTestAutomationComRpc.so",
       "status": "production",
       "description": "TestAutomationComRpc helps you to validate COMRPC messages via Automated Tests",
       "version": "1.0"
diff --git a/tests/TestAutomationMemory/CMakeLists.txt b/tests/TestAutomationMemory/CMakeLists.txt
index b02b1701..09167629 100644
--- a/tests/TestAutomationMemory/CMakeLists.txt
+++ b/tests/TestAutomationMemory/CMakeLists.txt
@@ -19,7 +19,7 @@ project(TestAutomationMemory)
 
 cmake_minimum_required(VERSION 3.15)
 
-find_package(WPEFramework)
+find_package(Thunder)
 
 project_version(1.0.0)
 
diff --git a/tests/TestAutomationMemory/TestAutomationMemoryPlugin.json b/tests/TestAutomationMemory/TestAutomationMemoryPlugin.json
index ead0b65f..dff2ef12 100644
--- a/tests/TestAutomationMemory/TestAutomationMemoryPlugin.json
+++ b/tests/TestAutomationMemory/TestAutomationMemoryPlugin.json
@@ -3,7 +3,7 @@
     "info": {
       "title": "TestAutomationMemory Plugin",
       "callsign": "TestAutomationMemory",
-      "locator": "libWPEFrameworkTestAutomationMemory.so",
+      "locator": "libThunderTestAutomationMemory.so",
       "status": "production",
       "description": "TestAutomationMemory manipulates memory usage for Automated Tests.",
       "version": "1.0"