diff --git a/opencl/CMakeLists.txt b/opencl/CMakeLists.txt
index 94f84ad75c..aa8e8acea3 100644
--- a/opencl/CMakeLists.txt
+++ b/opencl/CMakeLists.txt
@@ -161,12 +161,8 @@ if(POLICY CMP0037)
     cmake_policy(PUSH)
     cmake_policy(SET CMP0037 OLD)
 endif()
-file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/fixnames
-	CONTENT "pwd; for i in *.deb; do mv \"\$i\" \"\${i/.deb/-amd64.deb}\" ; done
-	for i in *.rpm ; do mv \"\$i\" \"\${i/.rpm/.x86_64.rpm}\" ; done
-")
+
 add_custom_target(package
-    COMMAND bash ${PROJECT_BINARY_DIR}/fixnames
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
     DEPENDS pkg_rocm_opencl pkg_rocm_opencl_dev)
 if(POLICY CMP0037)
diff --git a/opencl/packaging/rocm-opencl-dev.txt b/opencl/packaging/rocm-opencl-dev.txt
index ebc8af7149..9411ee1fd5 100644
--- a/opencl/packaging/rocm-opencl-dev.txt
+++ b/opencl/packaging/rocm-opencl-dev.txt
@@ -24,12 +24,12 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
 
 # Debian CPACK variables
 set(CPACK_BINARY_DEB "ON")
+set(CPACK_DEBIAN_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-amd64.deb)
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "mesa-common-dev, rocm-opencl")
 
 # RPM CPACK variables
 set(CPACK_BINARY_RPM "ON")
-set(CPACK_RPM_PACKAGE_NAME "rocm-opencl-devel")
-set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
+set(CPACK_RPM_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.x86_64.rpm)
 set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
 set(CPACK_RPM_PACKAGE_REQUIRES "rocm-opencl")
 
diff --git a/opencl/packaging/rocm-opencl.txt b/opencl/packaging/rocm-opencl.txt
index d637c5f66d..841184019d 100644
--- a/opencl/packaging/rocm-opencl.txt
+++ b/opencl/packaging/rocm-opencl.txt
@@ -22,12 +22,13 @@ set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
 
 # Debian CPACK variables
 set(CPACK_BINARY_DEB "ON")
+set(CPACK_DEBIAN_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}-amd64.deb)
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_BINARY_DIR}/postinst;${PROJECT_BINARY_DIR}/prerm")
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libelf-dev, comgr, hsa-rocr-dev")
 
 # RPM CPACK variables
 set(CPACK_BINARY_RPM "ON")
-set(CPACK_RPM_PACKAGE_ARCHITECTURE "${CMAKE_SYSTEM_PROCESSOR}")
+set(CPACK_RPM_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}.x86_64.rpm)
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/rpm_post")
 set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${PROJECT_BINARY_DIR}/rpm_postun")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV " no")