diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3fbb0924e..68857f29a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,6 +170,10 @@ else()
       )
     endif()
 
+    if(AMDGPU_TARGETS AND NOT GPU_TARGETS)
+      message( DEPRECATION "AMDGPU_TARGETS use is deprecated. Use GPU_TARGETS." )
+    endif()
+
     if (AMDGPU_TARGETS)
         set(TMPAMDGPU_TARGETS "${AMDGPU_TARGETS}")
         if(TMPAMDGPU_TARGETS STREQUAL "all" )
@@ -180,8 +184,10 @@ else()
     else()
         set(AMDGPU_TARGETS "${DEFAULT_AMDGPU_TARGETS}" CACHE STRING "List of specific machine types for library to target")
     endif()
+    # Don't force, the user should be allowed to override this if desired
+    set(GPU_TARGETS "${AMDGPU_TARGETS}" CACHE STRING "List of specific machine times for library to target")
 
-    message(STATUS "AMDGPU_TARGETS: ${AMDGPU_TARGETS}")
+    message(STATUS "GPU_TARGETS: ${GPU_TARGETS}")
 
     if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
         find_package( hip REQUIRED CONFIG PATHS ${HIP_DIR} ${ROCM_PATH} /opt/rocm )
@@ -191,7 +197,7 @@ else()
 
     if( BUILD_WITH_TENSILE )
     # we will have expanded "all" for tensile to ensure consistency as we have local rules
-    set( Tensile_ARCHITECTURE "${AMDGPU_TARGETS}" CACHE STRING "Tensile to use which architecture?" FORCE)
+    set( Tensile_ARCHITECTURE "${GPU_TARGETS}" CACHE STRING "Tensile to use which architecture?" FORCE)
 
     set( Tensile_LOGIC "asm_full" CACHE STRING "Tensile to use which logic?")
     set( Tensile_CODE_OBJECT_VERSION "default" CACHE STRING "Tensile code_object_version")
diff --git a/cmake/Verbose.cmake b/cmake/Verbose.cmake
index 9b55edd5c2..91599f50be 100644
--- a/cmake/Verbose.cmake
+++ b/cmake/Verbose.cmake
@@ -46,4 +46,4 @@ message(STATUS "\t==>CMAKE_SHARED_LINKER_FLAGS         : ${CMAKE_SHARED_LINKER_F
 message(STATUS "\t==>CMAKE_SHARED_LINKER_FLAGS_DEBUG   : ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
 message(STATUS "\t==>CMAKE_SHARED_LINKER_FLAGS_RELEASE : ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
 message(STATUS "==============" )
-message(STATUS "\t==>AMDGPU_TARGETS                    : ${AMDGPU_TARGETS}")
+message(STATUS "\t==GPU_TARGETS                        : ${GPU_TARGETS}")
diff --git a/install.sh b/install.sh
index f0d6849492..5f53903416 100755
--- a/install.sh
+++ b/install.sh
@@ -675,7 +675,7 @@ pushd .
   # #################################################
   # configure & build
   # #################################################
-  cmake_common_options="-DAMDGPU_TARGETS=${gpu_architecture}"
+  cmake_common_options="-DGPU_TARGETS=${gpu_architecture}"
   cmake_client_options=""
 
   if [[ "${legacy_hipblas_direct}" == true ]]; then