diff --git a/tmp/invoke-rename.sh b/tmp/invoke-rename.sh
index f12e230..d71bd42 100755
--- a/tmp/invoke-rename.sh
+++ b/tmp/invoke-rename.sh
@@ -8,12 +8,13 @@
 tmp/analyze-names.sh
 tmp/makelist.pl public-names extra-names > old2new
 
-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/ssl_???.c tests/ssl-opt.sh \
-                 programs/*.c programs/*/*.c scripts/* tests/scripts/*
+scripts/rename.pl -f old2new \
+    library/*.c tests/suites/* configs/* scripts/data_files/*.fmt
+scripts/rename.pl -f old2new -s \
+    library/error.c library/version_features.c \
+    library/memory_buffer_alloc.c include/mbedtls/*.h \
+    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 \
          tests/suites/test_suite_version.data configs/README.txt
diff --git a/tmp/rename.pl b/tmp/rename.pl
deleted file mode 100755
index f06647c..0000000
--- a/tmp/rename.pl
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-
-use utf8;
-use open qw(:std utf8);
-
-# apply substitutions from the table in the first arg to files
-#   expected usage: via invoke-rename.pl
-
-my $do_strings = 0;
-if( $ARGV[0] eq "-s" ) {
-    shift;
-    $do_strings = 1;
-}
-
-die "Usage: $0 [-s] names-file [filenames...]\n" if( @ARGV < 1 or ! -r $ARGV[0] );
-
-open my $nfh, '<', shift or die;
-my @names = <$nfh>;
-close $nfh or die;
-
-my %subst;
-for my $name (@names) {
-    chomp $name;
-    my ($old, $new) = split / /, $name;
-    $subst{$old} = $new;
-}
-
-my $string = qr/".*?(?<!\\)"/;
-my $space = qr/\s+/;
-my $idnum = qr/[a-zA-Z0-9_]+/;
-my $symbols = qr/[!#%&'()*+,-.:;<=>?@^_`{|}~\$\/\[\\\]]+|"/;
-
-# if we replace inside strings, we don't consider them a token
-my $token = $do_strings ?         qr/$space|$idnum|$symbols/
-                        : qr/$string|$space|$idnum|$symbols/;
-
-my %warnings;
-
-while( my $filename = shift )
-{
-    print STDERR "$filename... ";
-    if( -d $filename ) { print STDERR "skip (directory)\n"; next }
-
-    open my $rfh, '<', $filename or die;
-    my @lines = <$rfh>;
-    close $rfh or die;
-
-    my @out;
-    for my $line (@lines) {
-        if( $line =~ /#include/ ) {
-            $line =~ s/polarssl/mbedtls/;
-            $line =~ s/POLARSSL/MBEDTLS/;
-            push( @out, $line );
-            next;
-        }
-
-        my @words = ($line =~ /$token/g);
-        my $checkline = join '', @words;
-        if( $checkline eq $line ) {
-            my @new = map { exists $subst{$_} ? $subst{$_} : $_ } @words;
-            push( @out, join '', @new );
-        } else {
-            $warnings{$filename} = [] unless $warnings{$filename};
-            push @{ $warnings{$filename} }, $line;
-            push( @out, $line );
-        }
-    }
-
-    open my $wfh, '>', $filename or die;
-    print $wfh $_ for @out;
-    close $wfh or die;
-    print STDERR "done\n";
-}
-
-if( %warnings ) {
-    print "\nWarning: lines skipped due to unexpected charaacters:\n";
-    for my $filename (sort keys %warnings) {
-        print "in $filename:\n";
-        print for @{ $warnings{$filename} };
-    }
-}