diff --git a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
index c55968d2..3733c74a 100755
--- a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
+++ b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
@@ -475,7 +475,7 @@ macro(rocm_compute_component_package_name COMPONENT_NAME BASE_NAME NAME_SUFFIX H
     else()
         if(ENABLE_ASAN_PACKAGING)
             set(_component_suffix asan)
-        elseif(NOT ${HEADER_ONLY} AND NOT ${BUILD_SHARED_LIBS})
+        elseif(NOT ${BUILD_SHARED_LIBS})
             set(_component_suffix static)
         endif()
     endif()
@@ -500,13 +500,13 @@ macro(rocm_compute_component_package_name COMPONENT_NAME BASE_NAME NAME_SUFFIX H
         OR CPACK_RPM_${_component_name_upper}_PACKAGE_NAME STREQUAL ""
     )
         set(CPACK_RPM_${_component_name_upper}_PACKAGE_NAME
-            "${BASE_NAME}${_rpm_component_partial}${_component_suffix}")
+            "${BASE_NAME}${_component_suffix}${_rpm_component_partial}")
     endif()
     if(NOT DEFINED CPACK_DEBIAN_${_component_name_upper}_PACKAGE_NAME
         OR CPACK_DEBIAN_${_component_name_upper}_PACKAGE_NAME STREQUAL ""
     )
         set(CPACK_DEBIAN_${_component_name_upper}_PACKAGE_NAME
-            "${BASE_NAME}${_deb_component_partial}${_component_suffix}")
+            "${BASE_NAME}${_component_suffix}${_deb_component_partial}")
     endif()
 
     # clean up temporary variables