diff --git a/projects/clr/hipamd/bin/hipdemangleatp b/projects/clr/hipamd/bin/hipdemangleatp
index d5061ed7d2..f979f59434 100755
--- a/projects/clr/hipamd/bin/hipdemangleatp
+++ b/projects/clr/hipamd/bin/hipdemangleatp
@@ -6,16 +6,14 @@
 kernels=$(grep grid_launch_parm $1 | cut -d" " -f1 | sort | uniq)
 for mangled_sym in $kernels; do
     real_sym=$(c++filt -p $(c++filt _$mangled_sym | cut -d: -f3 | sed 's/_functor//g'))
-    echo "$mangled_sym => $real_sym" >> $1.log
+    #echo "$mangled_sym => $real_sym" >> $1.log
     sed -i "s/$mangled_sym/$real_sym/g" $1
 done
 
 # HC kernels
-#kernels=$(grep cxxamp_trampoline $1 | cut -d" " -f1 | sort | uniq)
-#for mangled_sym in $kernels; do
-#    real_sym=$(c++filt $(c++filt $mangled_sym | cut -d: -f3 | sed 's/_functor//g') | cut -d\( -f1 | cut -d" " -f2)
-#    sed -i "s/$mangled_sym/$real_sym/g" $1
-#done
-#
-#sed -e "s/^/_/g; s/_EC_/$/g" < test.txt | c++filt
-
+kernels=$(grep cxxamp_trampoline $1 | cut -d" " -f1 | sort | uniq)
+for mangled_sym in $kernels; do
+    real_sym=$(echo $mangled_sym |  sed "s/^/_/g; s/_EC_/_$/g" | c++filt -p | cut -d\( -f1 | cut -d" " -f1 --complement)
+    #echo "$mangled_sym => $real_sym" >> $1.log
+    sed -i "s/$mangled_sym/$real_sym/g" $1
+done