diff --git a/demos/auth.c b/demos/auth.c
index 154a0e18..eed4fde9 100644
--- a/demos/auth.c
+++ b/demos/auth.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * Full featured authentication which is used to verify that the message
diff --git a/demos/box.c b/demos/box.c
index a3355196..e69460b6 100644
--- a/demos/box.c
+++ b/demos/box.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * Shows how crypto_box works using Bob and Alice with a simple message.
diff --git a/demos/generichash.c b/demos/generichash.c
index 9b284ff0..6c0508f5 100644
--- a/demos/generichash.c
+++ b/demos/generichash.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * Generic hash is intended as a variable output hash with enough strength
diff --git a/demos/generichashstream.c b/demos/generichashstream.c
index 30ef6133..08d840ce 100644
--- a/demos/generichashstream.c
+++ b/demos/generichashstream.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * Streaming variant of generic hash. This has the ability to hash
diff --git a/demos/hash.c b/demos/hash.c
index dbdcb278..2c765819 100644
--- a/demos/hash.c
+++ b/demos/hash.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * The library ships with a one-shot SHA-512 implementation. Simply allocate
diff --git a/demos/onetimeauth.c b/demos/onetimeauth.c
index e08261e8..7e8f193a 100644
--- a/demos/onetimeauth.c
+++ b/demos/onetimeauth.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * This method is only effective for a single use per key. The benefit is
diff --git a/demos/shorthash.c b/demos/shorthash.c
index 52b534ab..a0317edc 100644
--- a/demos/shorthash.c
+++ b/demos/shorthash.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * Short hash is a fast algorithm intended for hash tables and anything
diff --git a/demos/sign.c b/demos/sign.c
index 57b13966..a7132790 100644
--- a/demos/sign.c
+++ b/demos/sign.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * Signs a message with secret key which will authenticate a message.
diff --git a/demos/stream.c b/demos/stream.c
index d9588116..4d9fe1ca 100644
--- a/demos/stream.c
+++ b/demos/stream.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h> /* library header */
 
-#include "demo_utils.h" /* utility functions shared by demos */
+#include "utils.h" /* utility functions shared by demos */
 
 /*
  * Stream utilizes a nonce to generate a sequence of bytes. The library has
diff --git a/demos/demo_utils.c b/demos/utils.c
similarity index 98%
rename from demos/demo_utils.c
rename to demos/utils.c
index e56abba0..1a1fe429 100644
--- a/demos/demo_utils.c
+++ b/demos/utils.c
@@ -8,7 +8,7 @@
 
 #include <sodium.h>
 
-#include "demo_utils.h"
+#include "utils.h"
 
 /* ================================================================== *
  *                          utility functions                         *
diff --git a/demos/demo_utils.h b/demos/utils.h
similarity index 100%
rename from demos/demo_utils.h
rename to demos/utils.h