diff --git a/tool/Makefile.am b/tool/Makefile.am
index a3d609f..5d5027b 100644
--- a/tool/Makefile.am
+++ b/tool/Makefile.am
@@ -39,7 +39,7 @@ noinst_LTLIBRARIES = libpiv_cmd.la libpiv_util.la
 libpiv_cmd_la_SOURCES = cmdline.ggo cmdline.c cmdline.h
 libpiv_cmd_la_CFLAGS =
 
-libpiv_util_la_SOURCES = util.c internal.h
+libpiv_util_la_SOURCES = util.c util.h
 
 cmdline.c cmdline.h: cmdline.ggo Makefile.am
 	$(GENGETOPT) --input $^
diff --git a/tool/util.c b/tool/util.c
index 6c99119..b297aa1 100644
--- a/tool/util.c
+++ b/tool/util.c
@@ -41,7 +41,7 @@
 #include <ykpiv.h>
 
 #include "cmdline.h"
-#include "internal.h"
+#include "util.h"
 
 FILE *open_file(const char *file_name, int mode) {
   FILE *file;
diff --git a/tool/internal.h b/tool/util.h
similarity index 100%
rename from tool/internal.h
rename to tool/util.h
diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c
index 15e04e5..2c628c2 100644
--- a/tool/yubico-piv-tool.c
+++ b/tool/yubico-piv-tool.c
@@ -44,7 +44,7 @@
 #include <openssl/rand.h>
 
 #include "cmdline.h"
-#include "internal.h"
+#include "util.h"
 
 /* FASC-N containing S9999F9999F999999F0F1F0000000000300001E encoded in
  * 4-bit BCD with 1 bit parity. run through the tools/fasc.pl script to get