diff --git a/tmp/invoke-rename.sh b/tmp/invoke-rename.sh
index f1ba618b6..f12e23027 100755
--- a/tmp/invoke-rename.sh
+++ b/tmp/invoke-rename.sh
@@ -8,11 +8,11 @@ set -eu
 tmp/analyze-names.sh
 tmp/makelist.pl public-names extra-names > old2new
 
-tmp/rename.pl    old2new library/*.c tests/suites/* tests/ssl-opt.sh \
+tmp/rename.pl    old2new library/*.c tests/suites/* \
                  configs/* scripts/data_files/*.fmt
 tmp/rename.pl -s old2new library/error.c library/version_features.c \
                  library/memory_buffer_alloc.c include/mbedtls/*.h \
-                 library/ecp.c \
+                 library/ecp.c library/ssl_???.c tests/ssl-opt.sh \
                  programs/*.c programs/*/*.c scripts/* tests/scripts/*
 
 for i in scripts/generate_errors.pl scripts/memory.sh tests/compat.sh \
@@ -23,6 +23,9 @@ do
 done
 chmod +x scripts/generate_errors.pl scripts/memory.sh tests/compat.sh
 
+sed -e 's/server5-mbedtls_sha1/server5-sha1/' -i.tmp tests/ssl-opt.sh
+rm -f tests/ssl-opt.sh.tmp
+
 echo; echo 'Done. Remaining polarssl occurences:'
 rm -f enum-consts exported-symbols extra-names identifiers macros old2new \
       prefix-enum-consts prefix-identifiers prefix-macros public-names \