diff --git a/libhsakmt/CMakeLists.txt b/libhsakmt/CMakeLists.txt
index 7d71d514b8..01c5e1f576 100644
--- a/libhsakmt/CMakeLists.txt
+++ b/libhsakmt/CMakeLists.txt
@@ -308,13 +308,13 @@ target_link_libraries ( ${HSAKMT_STATIC_DRM_TARGET}
 target_compile_options(${HSAKMT_STATIC_DRM_TARGET} PRIVATE ${DRM_CFLAGS} ${HSAKMT_C_FLAGS})
 
 install ( TARGETS ${HSAKMT_STATIC_DRM_TARGET} EXPORT ${HSAKMT_STATIC_DRM_TARGET}Targets
-          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
-          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel)
+          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev
+          LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev)
 install ( EXPORT ${HSAKMT_STATIC_DRM_TARGET}Targets
   FILE ${HSAKMT_STATIC_DRM_TARGET}Targets.cmake
   NAMESPACE ${HSAKMT_STATIC_DRM_TARGET}::
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${HSAKMT_TARGET}
-  COMPONENT devel)
+  COMPONENT dev)
 
 ###########################
 # Packaging directives
diff --git a/rocrtst/suites/test_common/CMakeLists.txt b/rocrtst/suites/test_common/CMakeLists.txt
index 9a9ea26a8d..c0c0fc4086 100755
--- a/rocrtst/suites/test_common/CMakeLists.txt
+++ b/rocrtst/suites/test_common/CMakeLists.txt
@@ -83,13 +83,21 @@ if( DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE} )
   set ( CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE} )
 endif()
 ## Add os details to rpm package name. For deb packages, its set from build environment
-execute_process( COMMAND rpm --eval %{?dist}
-                 RESULT_VARIABLE PROC_RESULT
-                 OUTPUT_VARIABLE EVAL_RESULT
-                 OUTPUT_STRIP_TRAILING_WHITESPACE )
-if ( PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "" )
-  string ( APPEND CPACK_RPM_PACKAGE_RELEASE "%{?dist}" )
+# Modify line 87 to be "if the env. variable DISTRO_NAME IS centos or rhel"
+if (DEFINED ENV{DISTRO_NAME} AND
+  (ENV{DISTRO_NAME} MATCHES "centos" OR
+   ENV{DISTRO_NAME} MATCHES "rhel" OR
+   ENV{DISTRO_NAME} MATCHES "sles"))
+  execute_process(COMMAND rpm --eval %{?dist}
+          RESULT_VARIABLE PROC_RESULT
+          OUTPUT_VARIABLE EVAL_RESULT
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if (PROC_RESULT EQUAL "0" AND NOT EVAL_RESULT STREQUAL "")
+    string (APPEND CPACK_RPM_PACKAGE_RELEASE "%{?dist}")
+  endif()
 endif()
+
+
 set (CPACK_RPM_PACKAGE_REQUIRES "rocm-core,hsa-rocr")
 
 set(DEFAULT_TARGETS "gfx700;gfx701;gfx702;gfx801;gfx802;gfx803;gfx805;gfx810"