Rename files: s/stick10/NKPro and s/stick20/NKStorage

Signed-off-by: Elie Tournier <tournier.elie@gmail.com>

10 files changed, 13 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1103db..270d13e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,12 +48,12 @@ set(SOURCE_FILES
     include/log.h
     include/misc.h
     include/NitrokeyManager.h
-    include/stick10_commands.h
-    include/stick20_commands.h
+    include/NKPro_commands.h
+    include/NKStorage_commands.h
     include/CommandFailedException.h
     include/LibraryException.h
     include/LongOperationInProgressException.h
-    include/stick10_commands_0.8.h
+    include/NKPro_commands_0.8.h
     command_id.cc
     device.cc
     log.cc
diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index 9a9d106..d491fa9 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -4,7 +4,7 @@
 #include "include/LibraryException.h"
 #include <algorithm>
 #include <unordered_map>
-#include <stick20_commands.h>
+#include <NKStorage_commands.h>
 #include "include/misc.h"
 #include <mutex>
 #include "include/cxx_semantics.h"
diff --git a/README.md b/README.md
index 99c4a44..d0e1ce6 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 # libnitrokey
 Libnitrokey is a project to communicate with Nitrokey Pro and Storage devices in a clean and easy manner. Written in C++14, testable with `py.test` and `Catch` frameworks, with C API, Python access (through CFFI and C API, in future with Pybind11).
 
-The development of this project is aimed to make it itself a living documentation of communication protocol between host and the Nitrokey stick devices. The command packets' format is described here: [Pro v0.7](include/stick10_commands.h), [Pro v0.8](include/stick10_commands_0.8.h), [Storage](include/stick20_commands.h). Handling and additional operations are described here: [NitrokeyManager.cc](NitrokeyManager.cc).
+The development of this project is aimed to make it itself a living documentation of communication protocol between host and the Nitrokey stick devices. The command packets' format is described here: [Pro v0.7](include/NKPro_commands.h), [Pro v0.8](include/NKPro_commands_0.8.h), [Storage](include/NKStorage_commands.h). Handling and additional operations are described here: [NitrokeyManager.cc](NitrokeyManager.cc).
 
 A C++14 complying compiler is required due to heavy use of variable templates. For feature support tables please check [table 1](https://gcc.gnu.org/projects/cxx-status.html#cxx14) or [table 2](http://en.cppreference.com/w/cpp/compiler_support).
 
diff --git a/include/stick10_commands.h b/include/NKPro_commands.h
index e863328..e863328 100644
--- a/include/stick10_commands.h
+++ b/include/NKPro_commands.h
diff --git a/include/stick10_commands_0.8.h b/include/NKPro_commands_0.8.h
index 4209380..76bb030 100644
--- a/include/stick10_commands_0.8.h
+++ b/include/NKPro_commands_0.8.h
@@ -12,7 +12,7 @@
 #include <cstdint>
 #include "command.h"
 #include "device_proto.h"
-#include "stick10_commands.h"
+#include "NKPro_commands.h"
 
 #pragma pack (push,1)
 
diff --git a/include/stick20_commands.h b/include/NKStorage_commands.h
index 5f99d28..5f99d28 100644
--- a/include/stick20_commands.h
+++ b/include/NKStorage_commands.h
diff --git a/include/NitrokeyManager.h b/include/NitrokeyManager.h
index de14fbc..f6977d9 100644
--- a/include/NitrokeyManager.h
+++ b/include/NitrokeyManager.h
@@ -4,9 +4,9 @@
 #include "device.h"
 #include "log.h"
 #include "device_proto.h"
-#include "stick10_commands.h"
-#include "stick10_commands_0.8.h"
-#include "stick20_commands.h"
+#include "NKPro_commands.h"
+#include "NKPro_commands_0.8.h"
+#include "NKStorage_commands.h"
 #include <vector>
 #include <memory>
 
diff --git a/unittest/test.cc b/unittest/test.cc
index 15235bd..46b6ae1 100644
--- a/unittest/test.cc
+++ b/unittest/test.cc
@@ -4,7 +4,7 @@
 #include <string.h>
 #include "device_proto.h"
 #include "log.h"
-#include "stick10_commands.h"
+#include "NKPro_commands.h"
 
 using namespace std;
 using namespace nitrokey::device;
diff --git a/unittest/test2.cc b/unittest/test2.cc
index 31dbce8..13e33a3 100644
--- a/unittest/test2.cc
+++ b/unittest/test2.cc
@@ -9,8 +9,8 @@ static const char *const default_user_pin = "123456";
 #include <NitrokeyManager.h>
 #include "device_proto.h"
 #include "log.h"
-//#include "stick10_commands.h"
-#include "stick20_commands.h"
+//#include "NKPro_commands.h"
+#include "NKStorage_commands.h"
 
 using namespace std;
 using namespace nitrokey::device;
diff --git a/unittest/test_HOTP.cc b/unittest/test_HOTP.cc
index e6f7d7c..a1301ab 100644
--- a/unittest/test_HOTP.cc
+++ b/unittest/test_HOTP.cc
@@ -2,7 +2,7 @@
 #include <iostream>
 #include "device_proto.h"
 #include "log.h"
-#include "stick10_commands.h"
+#include "NKPro_commands.h"
 #include <cstdlib>
 #include "misc.h"