diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7b08abfd9c3b5ec15ee923800c95f662743ec0e..f1f938142e16fb9804510842f0bd7397c255433a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,7 +198,7 @@ if (CHAMELEON_ENABLE_CUDA AND NOT CHAMELEON_USE_CUDA)
 endif()
 
 # Enable Hmat-OSS kernels
-option(CHAMELEON_USE_HMAT "Enable hmat-oss kernels" OFF)
+option(CHAMELEON_USE_HMAT "Enable hmat kernels" OFF)
 
 option(CHAMELEON_RUNTIME_SYNC "Enable synchronous task submission when available to debug the code without parallelism" OFF)
 if (CHAMELEON_RUNTIME_SYNC)
@@ -271,14 +271,11 @@ add_subdirectory(hqr)
 if ( CHAMELEON_USE_HMAT )
   find_package(HMAT REQUIRED)
   if(HMAT_FOUND)
-    # hmat-oss target is not correctly defined
-    add_library(HMAT::hmat-oss INTERFACE IMPORTED)
-
-    set_target_properties(HMAT::hmat-oss PROPERTIES
+    set_target_properties(HMAT::hmat PROPERTIES
       INTERFACE_INCLUDE_DIRECTORIES "${HMAT_INCLUDE_DIRS}"
       INTERFACE_COMPILE_DEFINITIONS "${HMAT_DEFINITIONS}"
       INTERFACE_LINK_DIRECTORIES "${HMAT_LIBRARY_DIRS}"
-      INTERFACE_LINK_LIBRARIES "hmat-oss"
+      INTERFACE_LINK_LIBRARIES "hmat"
       )
     message( STATUS "HMAT: Found" )
   else()
diff --git a/coreblas/compute/CMakeLists.txt b/coreblas/compute/CMakeLists.txt
index 26c025f619a9405b245b9ed12adb11b3c57e62b1..081a231b89a1cb26b45edcc7fb1eb36ebdb70458 100644
--- a/coreblas/compute/CMakeLists.txt
+++ b/coreblas/compute/CMakeLists.txt
@@ -138,7 +138,7 @@ target_include_directories(coreblas PUBLIC
 set_property(TARGET coreblas PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 
 if( CHAMELEON_USE_HMAT )
-  target_link_libraries(coreblas PUBLIC HMAT::hmat-oss )
+  target_link_libraries(coreblas PUBLIC HMAT::hmat )
 endif()
 
 target_link_libraries(coreblas PRIVATE MORSE::LAPACKE)