diff --git a/projects/clr/hipamd/bin/hccgenco.sh b/projects/clr/hipamd/bin/hccgenco.sh
index dcedfa174d..a7b4177624 100755
--- a/projects/clr/hipamd/bin/hccgenco.sh
+++ b/projects/clr/hipamd/bin/hccgenco.sh
@@ -46,17 +46,15 @@ done
 printf "\nint main(){}\n" >> $hipgenisa_main
 
 $HIP_PATH/bin/hipcc $hipgenisa_files -o $hipgenisa_dir/a.out
-mv dump.* $hipgenisa_dir
-$ROCM_PATH/hcc-lc/bin/llvm-mc -arch=amdgcn -mcpu=$ROCM_TARGET -filetype=obj $hipgenisa_dir/dump.isa -o $hipgenisa_dir/dump.o
-$ROCM_PATH/llvm/bin/clang -target amdgcn--amdhsa $hipgenisa_dir/dump.o -o $hipgenisa_dir/dump.co
+mv dump* $hipgenisa_dir
 
 map_sym=""
-kernels=$(objdump -t $hipgenisa_dir/dump.co | grep grid_launch_parm | sed 's/ \+/ /g; s/\t/ /g' | cut -d" " -f6)
+kernels=$(objdump -t $hipgenisa_dir/dump-fiji.hsaco | grep grid_launch_parm | sed 's/ \+/ /g; s/\t/ /g' | cut -d" " -f6)
 for mangled_sym in $kernels; do
-  real_sym=$(c++filt $(c++filt _$mangled_sym | cut -d: -f3 | sed 's/_functor//g') | cut -d\( -f1)
+  real_sym=$(c++filt $(c++filt $mangled_sym | cut -d: -f3 | sed 's/_functor//g') | cut -d\( -f1)
   map_sym="--redefine-sym $mangled_sym=$real_sym $map_sym"
 done
-objcopy -F elf64-little $map_sym $hipgenisa_dir/dump.co $OUTPUT_FILE
+objcopy -F elf64-little $map_sym $hipgenisa_dir/dump-fiji.hsaco $OUTPUT_FILE
 
 rm $hipgenisa_files
 rm -r $hipgenisa_dir