diff --git a/main_test.go b/main_test.go
index 1574855..377b2c2 100644
--- a/main_test.go
+++ b/main_test.go
@@ -1,16 +1,15 @@
 package main
 
 import (
-	"os"
 	"testing"
 
 	"github.com/rogpeppe/go-internal/testscript"
 )
 
 func TestMain(m *testing.M) {
-	os.Exit(testscript.RunMain(m, map[string]func() int{
-		"testrpn": Main,
-	}))
+	testscript.Main(m, map[string]func(){
+		"rpn": main,
+	})
 }
 
 func TestRpn(t *testing.T) {
diff --git a/t/cmdline-command.txtar b/t/cmdline-command.txtar
index 681c813..3c12966 100644
--- a/t/cmdline-command.txtar
+++ b/t/cmdline-command.txtar
@@ -1,2 +1,2 @@
-exec testrpn 1 2 dump
+exec rpn 1 2 dump
 stdout 'Stack revision 2 .0x'
diff --git a/t/cmdline-invalidcommand.txtar b/t/cmdline-invalidcommand.txtar
index f1c0949..826370d 100644
--- a/t/cmdline-invalidcommand.txtar
+++ b/t/cmdline-invalidcommand.txtar
@@ -1,2 +1,2 @@
-! exec testrpn 1 2 dumb
+! exec rpn 1 2 dumb
 stdout 'unknown command or operator'
diff --git a/t/cmdline-precision.txtar b/t/cmdline-precision.txtar
index 4be06fe..df88c4d 100644
--- a/t/cmdline-precision.txtar
+++ b/t/cmdline-precision.txtar
@@ -1,2 +1,2 @@
-exec testrpn -p 4 2 3 /
+exec rpn -p 4 2 3 /
 stdout '0.6667\n'
diff --git a/t/cmdline-short-stack.txtar b/t/cmdline-short-stack.txtar
index 30ac14f..193ac8e 100644
--- a/t/cmdline-short-stack.txtar
+++ b/t/cmdline-short-stack.txtar
@@ -1,2 +1,2 @@
-! exec testrpn 4 +
+! exec rpn 4 +
 stdout 'stack doesn''t provide enough arguments'
diff --git a/t/cmdlinecalc-debug.txtar b/t/cmdlinecalc-debug.txtar
index d409e18..681cde8 100644
--- a/t/cmdlinecalc-debug.txtar
+++ b/t/cmdlinecalc-debug.txtar
@@ -1,2 +1,2 @@
-exec testrpn -d 44 55 *
+exec rpn -d 44 55 *
 stdout 'push to stack: 2420.00\n'
diff --git a/t/cmdlinecalc-divzero.txtar b/t/cmdlinecalc-divzero.txtar
index bc32f83..061b3b1 100644
--- a/t/cmdlinecalc-divzero.txtar
+++ b/t/cmdlinecalc-divzero.txtar
@@ -1,2 +1,2 @@
-! exec testrpn 100 50 50 - /
+! exec rpn 100 50 50 - /
 stdout 'division by null'
diff --git a/t/cmdlinecalc-lua.txtar b/t/cmdlinecalc-lua.txtar
index 16d8a72..229454a 100644
--- a/t/cmdlinecalc-lua.txtar
+++ b/t/cmdlinecalc-lua.txtar
@@ -1,4 +1,4 @@
-exec testrpn -d -c test.lua 3 5 lower
+exec rpn -d -c test.lua 3 5 lower
 stdout '3\n'
 
 -- test.lua --
diff --git a/t/cmdlinecalc-time.txtar b/t/cmdlinecalc-time.txtar
index 3658eeb..2660705 100644
--- a/t/cmdlinecalc-time.txtar
+++ b/t/cmdlinecalc-time.txtar
@@ -1,2 +1,2 @@
-exec testrpn 09:55 4:15 -
+exec rpn 09:55 4:15 -
 stdout '5.67\n'
diff --git a/t/cmdlinecalc.txtar b/t/cmdlinecalc.txtar
index f2390d6..5b41f71 100644
--- a/t/cmdlinecalc.txtar
+++ b/t/cmdlinecalc.txtar
@@ -1,2 +1,2 @@
-exec testrpn 44 55 *
+exec rpn 44 55 *
 stdout '2420\n'
diff --git a/t/getman.txtar b/t/getman.txtar
index 6a91f0c..9bafaed 100644
--- a/t/getman.txtar
+++ b/t/getman.txtar
@@ -1,2 +1,2 @@
-exec testrpn -m
+exec rpn -m
 stdout 'This software is licensed under the GNU GENERAL PUBLIC LICENSE'
diff --git a/t/getusage.txtar b/t/getusage.txtar
index 86d8f25..1ec1b55 100644
--- a/t/getusage.txtar
+++ b/t/getusage.txtar
@@ -1,2 +1,2 @@
-exec testrpn -h
+exec rpn -h
 stdout 'This is rpn'
diff --git a/t/getversion.txtar b/t/getversion.txtar
index 5ba2efa..516b157 100644
--- a/t/getversion.txtar
+++ b/t/getversion.txtar
@@ -1,2 +1,2 @@
-exec testrpn -v
+exec rpn -v
 stdout 'This is rpn version'
diff --git a/t/stdin-batch-cmd.txtar b/t/stdin-batch-cmd.txtar
index af63516..115eaa6 100644
--- a/t/stdin-batch-cmd.txtar
+++ b/t/stdin-batch-cmd.txtar
@@ -1,4 +1,4 @@
 exec echo 1 2 3 4 5 batch median
 stdin stdout
-exec testrpn
+exec rpn
 [unix] stdout '3\n'
diff --git a/t/stdin-batch.txtar b/t/stdin-batch.txtar
index d7391bb..c4db8ee 100644
--- a/t/stdin-batch.txtar
+++ b/t/stdin-batch.txtar
@@ -1,4 +1,4 @@
 exec echo 1 2 3 4 5
 stdin stdout
-[unix] exec testrpn median
+[unix] exec rpn median
 [unix] stdout '3\n'
diff --git a/t/stdin-calc.txtar b/t/stdin-calc.txtar
index 3d3e070..dd8df1a 100644
--- a/t/stdin-calc.txtar
+++ b/t/stdin-calc.txtar
@@ -1,4 +1,4 @@
 exec echo 10 10 +
 stdin stdout
-exec testrpn
+exec rpn
 [unix] stdout '20\n'
diff --git a/t/stdin-use-vars.txtar b/t/stdin-use-vars.txtar
index cc08a7c..758befe 100644
--- a/t/stdin-use-vars.txtar
+++ b/t/stdin-use-vars.txtar
@@ -1,5 +1,5 @@
 stdin input.txt
-exec testrpn
+exec rpn
 [unix] stdout '28\n'
 
 -- input.txt --
diff --git a/t/stdint-explicit-batch.txtar b/t/stdint-explicit-batch.txtar
index fd6b72a..84d56f4 100644
--- a/t/stdint-explicit-batch.txtar
+++ b/t/stdint-explicit-batch.txtar
@@ -1,4 +1,4 @@
 exec echo 1 2 3 4 5 median
 stdin stdout
-exec testrpn -b
+exec rpn -b
 [unix] stdout '3\n'