10 files changed, 52 insertions, 52 deletions
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index e4a768a..643dc31 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,31 +1,31 @@
 find_package(Boost REQUIRED COMPONENTS program_options)
 
-add_executable(util_aes_encrypt_block aes_encrypt_block.cpp aes_block_common.hpp)
-target_include_directories(util_aes_encrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_aes_encrypt_block libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(util_aes_encrypt_block PROPERTIES OUTPUT_NAME aes_encrypt_block)
+add_executable(util_encrypt_block encrypt_block.cpp block_common.hpp)
+target_include_directories(util_encrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_encrypt_block libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_encrypt_block PROPERTIES OUTPUT_NAME encrypt_block)
 
-add_executable(util_aes_decrypt_block aes_decrypt_block.cpp aes_block_common.hpp)
-target_include_directories(util_aes_decrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_aes_decrypt_block libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(util_aes_decrypt_block PROPERTIES OUTPUT_NAME aes_decrypt_block)
+add_executable(util_decrypt_block decrypt_block.cpp block_common.hpp)
+target_include_directories(util_decrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_decrypt_block libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_decrypt_block PROPERTIES OUTPUT_NAME decrypt_block)
 
-add_executable(util_aes_encrypt_file aes_encrypt_file.cpp aes_file_common.hpp)
-target_include_directories(util_aes_encrypt_file PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_aes_encrypt_file libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(util_aes_encrypt_file PROPERTIES OUTPUT_NAME aes_encrypt_file)
+add_executable(util_encrypt_file encrypt_file.cpp file_common.hpp)
+target_include_directories(util_encrypt_file PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_encrypt_file libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_encrypt_file PROPERTIES OUTPUT_NAME encrypt_file)
 
-add_executable(util_aes_decrypt_file aes_decrypt_file.cpp aes_file_common.hpp)
-target_include_directories(util_aes_decrypt_file PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_aes_decrypt_file libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(util_aes_decrypt_file PROPERTIES OUTPUT_NAME aes_decrypt_file)
+add_executable(util_decrypt_file decrypt_file.cpp file_common.hpp)
+target_include_directories(util_decrypt_file PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_decrypt_file libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_decrypt_file PROPERTIES OUTPUT_NAME decrypt_file)
 
-add_executable(util_aes_encrypt_bmp aes_encrypt_bmp.cpp aes_file_common.hpp)
-target_include_directories(util_aes_encrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_aes_encrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(util_aes_encrypt_bmp PROPERTIES OUTPUT_NAME aes_encrypt_bmp)
+add_executable(util_encrypt_bmp encrypt_bmp.cpp file_common.hpp)
+target_include_directories(util_encrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_encrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_encrypt_bmp PROPERTIES OUTPUT_NAME encrypt_bmp)
 
-add_executable(util_aes_decrypt_bmp aes_decrypt_bmp.cpp aes_file_common.hpp)
-target_include_directories(util_aes_decrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_aes_decrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES})
-set_target_properties(util_aes_decrypt_bmp PROPERTIES OUTPUT_NAME aes_decrypt_bmp)
+add_executable(util_decrypt_bmp decrypt_bmp.cpp file_common.hpp)
+target_include_directories(util_decrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS})
+target_link_libraries(util_decrypt_bmp libaesni libaesnixx ${Boost_LIBRARIES})
+set_target_properties(util_decrypt_bmp PROPERTIES OUTPUT_NAME decrypt_bmp)
diff --git a/utils/README.md b/utils/README.md
index 8403ee0..988a04a 100644
--- a/utils/README.md
+++ b/utils/README.md
@@ -22,7 +22,7 @@ Enable verbose output by passing the `--verbose` flag to the utilities.
 Please note that verbose output can only be produced when *not* using "boxes"
 (the `--boxes` flag).
 
-### aes_encrypt_block.exe
+### encrypt_block.exe
 
 Encrypts 16-byte blocks using AES-128/192/256 in the specified mode of
 operation.
@@ -37,7 +37,7 @@ For example, to encrypt
 
 run:
 
-    aes_encrypt_block.exe -a aes128 -m ecb 000102030405060708090a0b0c0d0e0f 00112233445566778899aabbccddeeff
+    encrypt_block.exe -a aes128 -m ecb 000102030405060708090a0b0c0d0e0f 00112233445566778899aabbccddeeff
 
 To encrypt
 
@@ -48,9 +48,9 @@ To encrypt
 
 run:
 
-    aes_encrypt_block.exe -a aes192 -m ofb 000102030405060708090a0b0c0d0e0f101112131415161718 22222222222222222222222222222222 00112233445566778899aabbccddeeff
+    encrypt_block.exe -a aes192 -m ofb 000102030405060708090a0b0c0d0e0f101112131415161718 22222222222222222222222222222222 00112233445566778899aabbccddeeff
 
-### aes_decrypt_block.exe
+### decrypt_block.exe
 
 Decrypts 16-byte blocks using AES-128/192/256 in the specified mode of
 operation.
@@ -65,7 +65,7 @@ For example, to decrypt
 
 run:
 
-    aes_decrypt_block.exe -a aes128 -m ecb 000102030405060708090a0b0c0d0e0f 69c4e0d86a7b0430d8cdb78070b4c55a
+    decrypt_block.exe -a aes128 -m ecb 000102030405060708090a0b0c0d0e0f 69c4e0d86a7b0430d8cdb78070b4c55a
 
 To decrypt
 
@@ -76,11 +76,11 @@ To decrypt
 
 run:
 
-    aes_decrypt_block.exe -a aes192 -m ofb 000102030405060708090a0b0c0d0e0f101112131415161718 22222222222222222222222222222222 bda298884f5c3a9eb7068aa7063a3b75
+    decrypt_block.exe -a aes192 -m ofb 000102030405060708090a0b0c0d0e0f101112131415161718 22222222222222222222222222222222 bda298884f5c3a9eb7068aa7063a3b75
 
 ## File encryption
 
-### aes_encrypt_file.exe
+### encrypt_file.exe
 
 Encrypts a file using AES-128/192/256 in the specified mode of operation.
 
@@ -94,7 +94,7 @@ For example, to encrypt the plaintext `input.txt`
 
 run:
 
-    aes_encrypt_file.exe -a aes128 -m ecb 11111111111111111111111111111111 input.txt output.txt
+    encrypt_file.exe -a aes128 -m ecb 11111111111111111111111111111111 input.txt output.txt
 
 To encrypt the plaintext from `input.txt`
 
@@ -105,9 +105,9 @@ To encrypt the plaintext from `input.txt`
 
 run
 
-    aes_encrypt_file.exe -a aes192 -m ofb 111111111111111111111111111111111111111111111111 22222222222222222222222222222222 input.txt output.txt
+    encrypt_file.exe -a aes192 -m ofb 111111111111111111111111111111111111111111111111 22222222222222222222222222222222 input.txt output.txt
 
-### aes_decrypt_file.exe
+### decrypt_file.exe
 
 Decrypts a file using AES-128/192/256 in the specified mode of operation.
 
@@ -121,7 +121,7 @@ To decrypt the ciphertext from `input.txt`
 
 run
 
-    aes_decrypt_file.exe -a aes128 -m ecb 11111111111111111111111111111111 input.txt output.txt
+    decrypt_file.exe -a aes128 -m ecb 11111111111111111111111111111111 input.txt output.txt
 
 To decrypt the ciphertext from `input.txt`
 
@@ -132,7 +132,7 @@ To decrypt the ciphertext from `input.txt`
 
 run
 
-    aes_decrypt_file.exe -a aes192 -m ofb 111111111111111111111111111111111111111111111111 22222222222222222222222222222222 input.txt output.txt
+    decrypt_file.exe -a aes192 -m ofb 111111111111111111111111111111111111111111111111 22222222222222222222222222222222 input.txt output.txt
 
 ## Bitmap encryption
 
@@ -145,12 +145,12 @@ Plaintext BMP | Encrypted in ECB mode | Encrypted in CBC mode
 ------------- | --------------------- | ---------------------
 ![Plaintext butterfly](bmp/butterfly.bmp?raw=true) | ![Ciphertext butterfly in ECB mode](bmp/cipherfly_ecb.bmp?raw=true) | ![Ciphertext butterfly in CBC mode](bmp/cipherfly_cbc.bmp?raw=true)
 
-### aes_encrypt_bmp.exe
+### encrypt_bmp.exe
 
 Encrypts the pixels in a BMP image file, preserving the header.
-The usage is the same as for [aes_encrypt_file.exe](#aes_encrypt_fileexe).
+The usage is the same as for [encrypt_file.exe](#encrypt_fileexe).
 
-### aes_decrypt_bmp.exe
+### decrypt_bmp.exe
 
 Decrypts the pixels in a BMP image file, preserving the header.
-The usage is the same as for [aes_decrypt_file.exe](#aes_decrypt_fileexe).
+The usage is the same as for [decrypt_file.exe](#decrypt_fileexe).
diff --git a/utils/aes_block_common.hpp b/utils/block_common.hpp
index 52b9ce3..52b9ce3 100644
--- a/utils/aes_block_common.hpp
+++ b/utils/block_common.hpp
diff --git a/utils/aes_decrypt_block.cpp b/utils/decrypt_block.cpp
index 0f41b47..9784657 100644
--- a/utils/aes_decrypt_block.cpp
+++ b/utils/decrypt_block.cpp
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include "aes_block_common.hpp"
+#include "block_common.hpp"
 
 #include <aesni/all.h>
 
@@ -211,7 +211,7 @@ int main(int argc, char** argv)
 {
     try
     {
-        CommandLineParser cmd_parser("aes_decrypt_block.exe");
+        CommandLineParser cmd_parser("decrypt_block.exe");
 
         if (!cmd_parser.parse_options(argc, argv))
             return 0;
diff --git a/utils/aes_decrypt_bmp.cpp b/utils/decrypt_bmp.cpp
index cf96847..3b075a4 100644
--- a/utils/aes_decrypt_bmp.cpp
+++ b/utils/decrypt_bmp.cpp
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include "aes_file_common.hpp"
+#include "file_common.hpp"
 
 #include <aesni/all.h>
 
@@ -174,7 +174,7 @@ int main(int argc, char** argv)
 {
     try
     {
-        CommandLineParser cmd_parser("aes_decrypt_bmp.exe");
+        CommandLineParser cmd_parser("decrypt_bmp.exe");
 
         if (!cmd_parser.parse_options(argc, argv))
             return 0;
diff --git a/utils/aes_decrypt_file.cpp b/utils/decrypt_file.cpp
index d456b67..3e08d6f 100644
--- a/utils/aes_decrypt_file.cpp
+++ b/utils/decrypt_file.cpp
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include "aes_file_common.hpp"
+#include "file_common.hpp"
 
 #include <aesni/all.h>
 
@@ -164,7 +164,7 @@ int main(int argc, char** argv)
 {
     try
     {
-        CommandLineParser cmd_parser("aes_encrypt_file.exe");
+        CommandLineParser cmd_parser("decrypt_file.exe");
 
         if (!cmd_parser.parse_options(argc, argv))
             return 0;
diff --git a/utils/aes_encrypt_block.cpp b/utils/encrypt_block.cpp
index 1b6b788..a40cc67 100644
--- a/utils/aes_encrypt_block.cpp
+++ b/utils/encrypt_block.cpp
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include "aes_block_common.hpp"
+#include "block_common.hpp"
 
 #include <aesni/all.h>
 
@@ -210,7 +210,7 @@ int main(int argc, char** argv)
 {
     try
     {
-        CommandLineParser cmd_parser("aes_encrypt_block.exe");
+        CommandLineParser cmd_parser("encrypt_block.exe");
 
         if (!cmd_parser.parse_options(argc, argv))
             return 0;
diff --git a/utils/aes_encrypt_bmp.cpp b/utils/encrypt_bmp.cpp
index 2615889..acdd893 100644
--- a/utils/aes_encrypt_bmp.cpp
+++ b/utils/encrypt_bmp.cpp
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include "aes_file_common.hpp"
+#include "file_common.hpp"
 
 #include <aesni/all.h>
 
@@ -173,7 +173,7 @@ int main(int argc, char** argv)
 {
     try
     {
-        CommandLineParser cmd_parser("aes_encrypt_bmp.exe");
+        CommandLineParser cmd_parser("encrypt_bmp.exe");
 
         if (!cmd_parser.parse_options(argc, argv))
             return 0;
diff --git a/utils/aes_encrypt_file.cpp b/utils/encrypt_file.cpp
index 61b9ba1..5747536 100644
--- a/utils/aes_encrypt_file.cpp
+++ b/utils/encrypt_file.cpp
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include "aes_file_common.hpp"
+#include "file_common.hpp"
 
 #include <aesni/all.h>
 
@@ -164,7 +164,7 @@ int main(int argc, char** argv)
 {
     try
     {
-        CommandLineParser cmd_parser("aes_encrypt_file.exe");
+        CommandLineParser cmd_parser("encrypt_file.exe");
 
         if (!cmd_parser.parse_options(argc, argv))
             return 0;
diff --git a/utils/aes_file_common.hpp b/utils/file_common.hpp
index 8a13b48..8a13b48 100644
--- a/utils/aes_file_common.hpp
+++ b/utils/file_common.hpp