diff --git a/tmp/invoke-rename.sh b/tmp/invoke-rename.sh
index c0615f2..d27ba87 100755
--- a/tmp/invoke-rename.sh
+++ b/tmp/invoke-rename.sh
@@ -2,11 +2,12 @@
 
 # test result with:
 # make all check
-# ggrep -i --exclude-dir=mpg --exclude=.travis.yml --exclude=ChangeLog --exclude=extra-names --exclude=public-names polarssl . --exclude-dir=tmp G -v 'include|OU?=PolarSSL|PolarSSLTes' | cut -d':' -f1 | sort -u
+# ggrep -i --exclude-dir=mpg --exclude=.travis.yml --exclude=ChangeLog --exclude=extra-names --exclude=public-names polarssl . --exclude-dir=tmp G -v 'OU?=PolarSSL|PolarSSLTes' | cut -d':' -f1 | sort -u
 
 set -eu
 
-FILES='include/mbedtls/*.h library/*.c programs/*.c programs/*/*.c tests/suites/* configs/*.h scripts/data_files/*.fmt scripts/* tests/scripts/*'
+tmp/analyze-names.sh
+tmp/makelist.pl public-names extra-names > old2new
 
-tmp/rename.pl old2new $FILES
-# re-invoke on programs including strings
+tmp/rename.pl old2new include/mbedtls/*.h library/*.c tests/suites/* configs/*.h scripts/data_files/*.fmt scripts/* tests/scripts/*
+tmp/rename.pl old2new programs/*.c programs/*/*.c