40 files changed, 43 insertions, 43 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 582309a..db1581f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,18 @@
-project(aesni C CXX ASM_MASM)
+project(aes_tools C CXX ASM_MASM)
 
-file(GLOB_RECURSE libaesni_headers "include/*.h")
+file(GLOB_RECURSE libaes_headers "include/*.h")
 if(AESNI_USE_ASM)
-    file(GLOB libaesni_c_sources "src/*.c")
-    file(GLOB libaesni_asm_sources "src/asm/*.asm")
-    set(libaesni_sources ${libaesni_asm_sources} ${libaesni_c_sources})
-    set_source_files_properties(${libaesni_asm_sources} PROPERTIES COMPILE_FLAGS "/safeseh")
+    file(GLOB libaes_c_sources "src/*.c")
+    file(GLOB libaes_asm_sources "src/asm/*.asm")
+    set(libaes_sources ${libaes_asm_sources} ${libaes_c_sources})
+    set_source_files_properties(${libaes_asm_sources} PROPERTIES COMPILE_FLAGS "/safeseh")
     # Setting CMAKE_ASM_MASM_FLAGS doesn't work: http://www.cmake.org/Bug/view.php?id=14711
 else()
-    file(GLOB_RECURSE libaesni_sources "src/*.c")
+    file(GLOB_RECURSE libaes_sources "src/*.c")
 endif()
-add_library(libaesni ${libaesni_sources} ${libaesni_headers})
-target_include_directories(libaesni PUBLIC include/)
-target_compile_definitions(libaesni PRIVATE _CRT_SECURE_NO_WARNINGS)
+add_library(libaes ${libaes_sources} ${libaes_headers})
+target_include_directories(libaes PUBLIC include/)
+target_compile_definitions(libaes PRIVATE _CRT_SECURE_NO_WARNINGS)
 
 add_subdirectory(cxx)
 
diff --git a/cxx/CMakeLists.txt b/cxx/CMakeLists.txt
index 71173b5..418f004 100644
--- a/cxx/CMakeLists.txt
+++ b/cxx/CMakeLists.txt
@@ -1,5 +1,5 @@
 find_package(Boost REQUIRED)
 
-add_library(libaesnixx INTERFACE)
-target_include_directories(libaesnixx INTERFACE include/ ${Boost_INCLUDE_DIRS})
-target_link_libraries(libaesnixx INTERFACE libaesni)
+add_library(libaesxx INTERFACE)
+target_include_directories(libaesxx INTERFACE include/ ${Boost_INCLUDE_DIRS})
+target_link_libraries(libaesxx INTERFACE libaes)
diff --git a/cxx/include/aesnixx/aes.hpp b/cxx/include/aesxx/aes.hpp
index b2febf5..698c0ef 100644
--- a/cxx/include/aesnixx/aes.hpp
+++ b/cxx/include/aesxx/aes.hpp
@@ -13,7 +13,7 @@
 #include "error.hpp"
 #include "mode.hpp"
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <cstddef>
 
diff --git a/cxx/include/aesnixx/algorithm.hpp b/cxx/include/aesxx/algorithm.hpp
index 85d2fc4..e2c73ac 100644
--- a/cxx/include/aesnixx/algorithm.hpp
+++ b/cxx/include/aesxx/algorithm.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 namespace aesni
 {
diff --git a/cxx/include/aesnixx/all.hpp b/cxx/include/aesxx/all.hpp
index 7c80d3b..7c80d3b 100644
--- a/cxx/include/aesnixx/all.hpp
+++ b/cxx/include/aesxx/all.hpp
diff --git a/cxx/include/aesnixx/api.hpp b/cxx/include/aesxx/api.hpp
index 6995ae2..6995ae2 100644
--- a/cxx/include/aesnixx/api.hpp
+++ b/cxx/include/aesxx/api.hpp
diff --git a/cxx/include/aesnixx/box.hpp b/cxx/include/aesxx/box.hpp
index 69383a8..ffca6ce 100644
--- a/cxx/include/aesnixx/box.hpp
+++ b/cxx/include/aesxx/box.hpp
@@ -12,7 +12,7 @@
 #include "error.hpp"
 #include "mode.hpp"
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <cassert>
 #include <cstddef>
diff --git a/cxx/include/aesnixx/data.hpp b/cxx/include/aesxx/data.hpp
index 1a93b7c..f52fe3e 100644
--- a/cxx/include/aesnixx/data.hpp
+++ b/cxx/include/aesxx/data.hpp
@@ -10,7 +10,7 @@
 
 #include "error.hpp"
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 namespace aesni
 {
diff --git a/cxx/include/aesnixx/debug.hpp b/cxx/include/aesxx/debug.hpp
index f3e35f4..f3e35f4 100644
--- a/cxx/include/aesnixx/debug.hpp
+++ b/cxx/include/aesxx/debug.hpp
diff --git a/cxx/include/aesnixx/error.hpp b/cxx/include/aesxx/error.hpp
index 067d563..1f22535 100644
--- a/cxx/include/aesnixx/error.hpp
+++ b/cxx/include/aesxx/error.hpp
@@ -10,7 +10,7 @@
 
 #include "debug.hpp"
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <boost/config.hpp>
 
diff --git a/cxx/include/aesnixx/mode.hpp b/cxx/include/aesxx/mode.hpp
index e19dbbd..706c4b5 100644
--- a/cxx/include/aesnixx/mode.hpp
+++ b/cxx/include/aesxx/mode.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <type_traits>
 
diff --git a/include/aesni/aes.h b/include/aes/aes.h
index ea859a3..ea859a3 100644
--- a/include/aesni/aes.h
+++ b/include/aes/aes.h
diff --git a/include/aesni/algorithm.h b/include/aes/algorithm.h
index a73b412..a73b412 100644
--- a/include/aesni/algorithm.h
+++ b/include/aes/algorithm.h
diff --git a/include/aesni/all.h b/include/aes/all.h
index bbea6f9..bbea6f9 100644
--- a/include/aesni/all.h
+++ b/include/aes/all.h
diff --git a/include/aesni/box.h b/include/aes/box.h
index 58517e1..58517e1 100644
--- a/include/aesni/box.h
+++ b/include/aes/box.h
diff --git a/include/aesni/box_aes.h b/include/aes/box_aes.h
index 3d7faec..3d7faec 100644
--- a/include/aesni/box_aes.h
+++ b/include/aes/box_aes.h
diff --git a/include/aesni/box_data.h b/include/aes/box_data.h
index 888c7c0..888c7c0 100644
--- a/include/aesni/box_data.h
+++ b/include/aes/box_data.h
diff --git a/include/aesni/data.h b/include/aes/data.h
index 94cff2c..94cff2c 100644
--- a/include/aesni/data.h
+++ b/include/aes/data.h
diff --git a/include/aesni/error.h b/include/aes/error.h
index a51284f..a51284f 100644
--- a/include/aesni/error.h
+++ b/include/aes/error.h
diff --git a/include/aesni/mode.h b/include/aes/mode.h
index 7650ec0..7650ec0 100644
--- a/include/aesni/mode.h
+++ b/include/aes/mode.h
diff --git a/include/aesni/padding.h b/include/aes/padding.h
index 7f19b18..7f19b18 100644
--- a/include/aesni/padding.h
+++ b/include/aes/padding.h
diff --git a/src/aes.c b/src/aes.c
index 82db7cc..f3dc178 100644
--- a/src/aes.c
+++ b/src/aes.c
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/box.c b/src/box.c
index 8869f69..7a26333 100644
--- a/src/box.c
+++ b/src/box.c
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/box_aes.c b/src/box_aes.c
index 62cb4f2..66eacae 100644
--- a/src/box_aes.c
+++ b/src/box_aes.c
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/c/aes128.c b/src/c/aes128.c
index a99c8a7..94e8a05 100644
--- a/src/c/aes128.c
+++ b/src/c/aes128.c
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <emmintrin.h>
 #include <wmmintrin.h>
diff --git a/src/c/aes192.c b/src/c/aes192.c
index a8ae6cf..570ab0e 100644
--- a/src/c/aes192.c
+++ b/src/c/aes192.c
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <emmintrin.h>
 #include <wmmintrin.h>
diff --git a/src/c/aes256.c b/src/c/aes256.c
index 6099204..23ac9ca 100644
--- a/src/c/aes256.c
+++ b/src/c/aes256.c
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <emmintrin.h>
 #include <wmmintrin.h>
diff --git a/src/error.c b/src/error.c
index 10550f3..49d8c72 100644
--- a/src/error.c
+++ b/src/error.c
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/padding.c b/src/padding.c
index 08cafb1..f76e7ca 100644
--- a/src/padding.c
+++ b/src/padding.c
@@ -6,7 +6,7 @@
  *            See LICENSE.txt for details.
  */
 
-#include <aesni/all.h>
+#include <aes/all.h>
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 0d57e27..6a69af0 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -2,30 +2,30 @@ find_package(Boost REQUIRED COMPONENTS filesystem program_options system)
 
 add_executable(util_encrypt_block encrypt_block.cpp block_cmd_parser.hpp block_dumper.hpp block_input.hpp data_parsers.hpp)
 target_include_directories(util_encrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_encrypt_block libaesnixx ${Boost_LIBRARIES})
+target_link_libraries(util_encrypt_block libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_encrypt_block PROPERTIES OUTPUT_NAME encrypt_block)
 
 add_executable(util_decrypt_block decrypt_block.cpp block_cmd_parser.hpp block_dumper.hpp block_input.hpp data_parsers.hpp)
 target_include_directories(util_decrypt_block PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_decrypt_block libaesnixx ${Boost_LIBRARIES})
+target_link_libraries(util_decrypt_block libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_decrypt_block PROPERTIES OUTPUT_NAME decrypt_block)
 
 add_executable(util_encrypt_file encrypt_file.cpp file_cmd_parser.hpp data_parsers.hpp)
 target_include_directories(util_encrypt_file PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_encrypt_file libaesnixx ${Boost_LIBRARIES})
+target_link_libraries(util_encrypt_file libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_encrypt_file PROPERTIES OUTPUT_NAME encrypt_file)
 
 add_executable(util_decrypt_file decrypt_file.cpp file_cmd_parser.hpp data_parsers.hpp)
 target_include_directories(util_decrypt_file PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_decrypt_file libaesnixx ${Boost_LIBRARIES})
+target_link_libraries(util_decrypt_file libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_decrypt_file PROPERTIES OUTPUT_NAME decrypt_file)
 
 add_executable(util_encrypt_bmp encrypt_bmp.cpp file_cmd_parser.hpp data_parsers.hpp)
 target_include_directories(util_encrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_encrypt_bmp libaesnixx ${Boost_LIBRARIES})
+target_link_libraries(util_encrypt_bmp libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_encrypt_bmp PROPERTIES OUTPUT_NAME encrypt_bmp)
 
 add_executable(util_decrypt_bmp decrypt_bmp.cpp file_cmd_parser.hpp data_parsers.hpp)
 target_include_directories(util_decrypt_bmp PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(util_decrypt_bmp libaesnixx ${Boost_LIBRARIES})
+target_link_libraries(util_decrypt_bmp libaesxx ${Boost_LIBRARIES})
 set_target_properties(util_decrypt_bmp PROPERTIES OUTPUT_NAME decrypt_bmp)
diff --git a/utils/block_cmd_parser.hpp b/utils/block_cmd_parser.hpp
index 62b0f36..db6da84 100644
--- a/utils/block_cmd_parser.hpp
+++ b/utils/block_cmd_parser.hpp
@@ -11,7 +11,7 @@
 #include "block_input.hpp"
 #include "data_parsers.hpp"
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
diff --git a/utils/block_dumper.hpp b/utils/block_dumper.hpp
index a473cd1..f41018d 100644
--- a/utils/block_dumper.hpp
+++ b/utils/block_dumper.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <cstdlib>
 
diff --git a/utils/data_parsers.hpp b/utils/data_parsers.hpp
index 333962e..d081659 100644
--- a/utils/data_parsers.hpp
+++ b/utils/data_parsers.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/program_options.hpp>
diff --git a/utils/decrypt_block.cpp b/utils/decrypt_block.cpp
index 456ef6c..7369052 100644
--- a/utils/decrypt_block.cpp
+++ b/utils/decrypt_block.cpp
@@ -10,7 +10,7 @@
 #include "block_dumper.hpp"
 #include "block_input.hpp"
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/program_options.hpp>
 
diff --git a/utils/decrypt_bmp.cpp b/utils/decrypt_bmp.cpp
index dac042a..c1f36bf 100644
--- a/utils/decrypt_bmp.cpp
+++ b/utils/decrypt_bmp.cpp
@@ -8,7 +8,7 @@
 
 #include "file_cmd_parser.hpp"
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/program_options.hpp>
 
diff --git a/utils/decrypt_file.cpp b/utils/decrypt_file.cpp
index dd95928..ad7e9d0 100644
--- a/utils/decrypt_file.cpp
+++ b/utils/decrypt_file.cpp
@@ -8,7 +8,7 @@
 
 #include "file_cmd_parser.hpp"
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/program_options.hpp>
 
diff --git a/utils/encrypt_block.cpp b/utils/encrypt_block.cpp
index 98fdec6..34b6d84 100644
--- a/utils/encrypt_block.cpp
+++ b/utils/encrypt_block.cpp
@@ -10,7 +10,7 @@
 #include "block_dumper.hpp"
 #include "block_input.hpp"
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/program_options.hpp>
 
diff --git a/utils/encrypt_bmp.cpp b/utils/encrypt_bmp.cpp
index 2dc3ea5..ea498cb 100644
--- a/utils/encrypt_bmp.cpp
+++ b/utils/encrypt_bmp.cpp
@@ -8,7 +8,7 @@
 
 #include "file_cmd_parser.hpp"
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/program_options.hpp>
 
diff --git a/utils/encrypt_file.cpp b/utils/encrypt_file.cpp
index bde7d83..3ae8744 100644
--- a/utils/encrypt_file.cpp
+++ b/utils/encrypt_file.cpp
@@ -8,7 +8,7 @@
 
 #include "file_cmd_parser.hpp"
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/program_options.hpp>
 
diff --git a/utils/file_cmd_parser.hpp b/utils/file_cmd_parser.hpp
index bc641ed..c8061fa 100644
--- a/utils/file_cmd_parser.hpp
+++ b/utils/file_cmd_parser.hpp
@@ -10,7 +10,7 @@
 
 #include "data_parsers.hpp"
 
-#include <aesnixx/all.hpp>
+#include <aesxx/all.hpp>
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>