diff --git a/coreblas/eztrace_module/CMakeLists.txt b/coreblas/eztrace_module/CMakeLists.txt
index 972ade489ed68dcb709aca78b5c0c7ab271281d1..23bc298cb7b098b3a60f56cf994481668001826d 100644
--- a/coreblas/eztrace_module/CMakeLists.txt
+++ b/coreblas/eztrace_module/CMakeLists.txt
@@ -46,26 +46,26 @@ if (EZTRACE_FOUND AND EZTRACE_DIR_FOUND)
             DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/coreblas_eztrace_module
             )
         add_custom_target(
-            eztrace-module-chameleon_cpu_func-dir ALL
+            eztrace-module-chameleon_core-dir ALL
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/output
             )
         add_custom_command(
-            OUTPUT libeztrace-autostart-chameleon_cpu_func.so libeztrace-chameleon_cpu_func.so libeztrace-convert-chameleon_cpu_func.so
+            OUTPUT libeztrace-autostart-chameleon_core.so libeztrace-chameleon_core.so libeztrace-convert-chameleon_core.so
             COMMAND make
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/output
             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/output
             )
         add_custom_target(
-            eztrace-module-chameleon_cpu_func-libs ALL
-            DEPENDS libeztrace-autostart-chameleon_cpu_func.so libeztrace-chameleon_cpu_func.so libeztrace-convert-chameleon_cpu_func.so
+            eztrace-module-chameleon_core-libs ALL
+            DEPENDS libeztrace-autostart-chameleon_core.so libeztrace-chameleon_core.so libeztrace-convert-chameleon_core.so
             )
         # installation
         # ------------
         install(
             FILES
-            ${CMAKE_CURRENT_BINARY_DIR}/output/libeztrace-autostart-chameleon_cpu_func.so
-            ${CMAKE_CURRENT_BINARY_DIR}/output/libeztrace-chameleon_cpu_func.so
-            ${CMAKE_CURRENT_BINARY_DIR}/output/libeztrace-convert-chameleon_cpu_func.so
+            ${CMAKE_CURRENT_BINARY_DIR}/output/libeztrace-autostart-chameleon_core.so
+            ${CMAKE_CURRENT_BINARY_DIR}/output/libeztrace-chameleon_core.so
+            ${CMAKE_CURRENT_BINARY_DIR}/output/libeztrace-convert-chameleon_core.so
             DESTINATION ${EZTRACE_LIBRARY_DIRS}
             )
 
diff --git a/coreblas/eztrace_module/coreblas_eztrace_module b/coreblas/eztrace_module/coreblas_eztrace_module
index fbc4950c5324d0014fb59578d069e872eebe397e..c0865e8616622a33e75bb3bb3eb4f75ced065603 100644
--- a/coreblas/eztrace_module/coreblas_eztrace_module
+++ b/coreblas/eztrace_module/coreblas_eztrace_module
@@ -1,6 +1,6 @@
 BEGIN_MODULE
-NAME chameleon_cpu_func
-DESC "Module for Chameleon CPU functions"
+NAME chameleon_core
+DESC "Module for Chameleon CORE functions"
 ID 7770
 
 void CORE_scasum(int storev, int uplo, int M, int N,