diff --git a/.gitignore b/.gitignore
index 912c457..cf1c889 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,7 @@
 /hw/application_fpga/tkey-libs/libcommon.a
 /hw/application_fpga/tkey-libs/libcrt0.a
 /hw/application_fpga/tkey-libs/libmonocypher.a
-/hw/application_fpga/tools/partition_table/partition_table
+/hw/application_fpga/tools/tkeyimage/tkeyimage
 /hw/application_fpga/tools/b2s/b2s
 synth.json
 synth.txt
diff --git a/hw/application_fpga/fw/README.md b/hw/application_fpga/fw/README.md
index d05dbe1..16e3a09 100644
--- a/hw/application_fpga/fw/README.md
+++ b/hw/application_fpga/fw/README.md
@@ -785,10 +785,10 @@ If you want to use a different pre-loaded app you have to
 2. Update the `allowed_app_digest` in `tk1/mgmt_app.c`.
 
 3. Create a new `default_partition.bin` using the
-   `tools/partition_table`, typically:
+   `tools/tkeyimage`, typically:
 
    ```
-   $ partition_table -app0 path/to/your/app.bin -o default_partition.bin
+   $ tkeyimage -app0 path/to/your/app.bin -o default_partition.bin
    ```
 
 4. Flash the filesystem image:
diff --git a/hw/application_fpga/tools/partition_table/README.md b/hw/application_fpga/tools/tkeyimage/README.md
similarity index 91%
rename from hw/application_fpga/tools/partition_table/README.md
rename to hw/application_fpga/tools/tkeyimage/README.md
index 6dbf650..3c4e417 100644
--- a/hw/application_fpga/tools/partition_table/README.md
+++ b/hw/application_fpga/tools/tkeyimage/README.md
@@ -1,4 +1,4 @@
-# partition\_table
+# tkeyimage
 
 A tool to parse or generate partition table or entire filesystems for
 the TKey.
@@ -16,7 +16,7 @@ Dump the entire data from flash, then inspect:
 
 ```
 $ tillitis-iceprog -R 1M dump.bin
-$ ./partition_table -i dump.bin -f
+$ ./tkeyimage -i dump.bin -f
 INFO: main.Flash struct is 1048576 byte long
 Partition Table Storage
   Partition Table
@@ -46,7 +46,7 @@ then inspect:
 
 ```
 $ tillitis-iceprog -o 128k -r partition.bin
-$ ./partition_table -i partition.bin
+$ ./tkeyimage -i partition.bin
 INFO: main.PartTableStorage struct is 365 byte long
 Partition Table Storage
   Partition Table
@@ -76,13 +76,13 @@ Partition Table Storage
 If you want to generate just a partition table:
 
 ```
-$ ./partition_table -o partition.bin
+$ ./tkeyimage -o partition.bin
 ```
 
 With an app in slot 0, filling in the size in the partition table:
 
 ```
-$ ./partition_table -o partition.bin -app0 ../../fw/testloadapp/testloadapp.bin
+$ ./tkeyimage -o partition.bin -app0 ../../fw/testloadapp/testloadapp.bin
 ```
 
 ### Generate flash image
@@ -93,7 +93,7 @@ with real hardware or qemu.
 Generate like this:
 
 ```
-$ ./partition_table -o flash.bin -f -app0 ../../fw/testloadapp/testloadapp.bin
+$ ./tkeyimage -o flash.bin -f -app0 ../../fw/testloadapp/testloadapp.bin
 ```
 
 Using `-app0` is mandatory because TKey firmware won't start without
diff --git a/hw/application_fpga/tools/partition_table/go.mod b/hw/application_fpga/tools/tkeyimage/go.mod
similarity index 80%
rename from hw/application_fpga/tools/partition_table/go.mod
rename to hw/application_fpga/tools/tkeyimage/go.mod
index f14a95d..6ede5b7 100644
--- a/hw/application_fpga/tools/partition_table/go.mod
+++ b/hw/application_fpga/tools/tkeyimage/go.mod
@@ -1,4 +1,4 @@
-module partition_table
+module tkeyimage
 
 go 1.23.0
 
diff --git a/hw/application_fpga/tools/partition_table/go.sum b/hw/application_fpga/tools/tkeyimage/go.sum
similarity index 100%
rename from hw/application_fpga/tools/partition_table/go.sum
rename to hw/application_fpga/tools/tkeyimage/go.sum
diff --git a/hw/application_fpga/tools/partition_table/partition_table.go b/hw/application_fpga/tools/tkeyimage/tkeyimage.go
similarity index 100%
rename from hw/application_fpga/tools/partition_table/partition_table.go
rename to hw/application_fpga/tools/tkeyimage/tkeyimage.go