diff --git a/.gitmodules b/.gitmodules
index 5b31f20..47010c1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "distrib/arch"]
 	path = distrib/arch
-	url = https://aur.archlinux.org/libbase.git
+	url = https://aur.archlinux.org/libbasen.git
diff --git a/Makefile b/Makefile
index 63dfc06..c6ab482 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ USRDIR ?= /usr
 .PHONY: build i install uni uninstall\
 		tools library tests clean
 
-LIB = base
+LIB = basen
 OBJS =\
 	hex\
 	baseN\
diff --git a/include/base.hpp b/include/base.hpp
deleted file mode 100644
index f35d13a..0000000
--- a/include/base.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <base/base58.hpp>
-#include <base/base64.hpp>
-#include <base/baseN.hpp>
-#include <base/hash/sha256.hpp>
-#include <base/hex.hpp>
-
diff --git a/include/basen.hpp b/include/basen.hpp
new file mode 100644
index 0000000..a1dd335
--- /dev/null
+++ b/include/basen.hpp
@@ -0,0 +1,6 @@
+#include <basen/base58.hpp>
+#include <basen/base64.hpp>
+#include <basen/baseN.hpp>
+#include <basen/hash/sha256.hpp>
+#include <basen/hex.hpp>
+
diff --git a/include/base/base58.hpp b/include/basen/base58.hpp
similarity index 100%
rename from include/base/base58.hpp
rename to include/basen/base58.hpp
diff --git a/include/base/base64.hpp b/include/basen/base64.hpp
similarity index 100%
rename from include/base/base64.hpp
rename to include/basen/base64.hpp
diff --git a/include/base/baseN.hpp b/include/basen/baseN.hpp
similarity index 100%
rename from include/base/baseN.hpp
rename to include/basen/baseN.hpp
diff --git a/include/base/hash/sha256.hpp b/include/basen/hash/sha256.hpp
similarity index 100%
rename from include/base/hash/sha256.hpp
rename to include/basen/hash/sha256.hpp
diff --git a/include/base/hex.hpp b/include/basen/hex.hpp
similarity index 100%
rename from include/base/hex.hpp
rename to include/basen/hex.hpp
diff --git a/src/base58.cpp b/src/base58.cpp
index 0c7afb2..6808463 100644
--- a/src/base58.cpp
+++ b/src/base58.cpp
@@ -1,8 +1,8 @@
 #include <stdexcept>
 
-#include <base/base58.hpp>
-#include <base/baseN.hpp>
-#include <base/hash/sha256.hpp>
+#include <basen/base58.hpp>
+#include <basen/baseN.hpp>
+#include <basen/hash/sha256.hpp>
 
 namespace base58
 {
diff --git a/src/base64.cpp b/src/base64.cpp
index 22a5852..17200d3 100644
--- a/src/base64.cpp
+++ b/src/base64.cpp
@@ -2,8 +2,8 @@
 #include <limits>
 #include <stdexcept>
 
-#include <base/base64.hpp>
-#include <base/baseN.hpp>
+#include <basen/base64.hpp>
+#include <basen/baseN.hpp>
 
 namespace base64
 {
diff --git a/src/baseN.cpp b/src/baseN.cpp
index e64f2f0..5f3d361 100644
--- a/src/baseN.cpp
+++ b/src/baseN.cpp
@@ -3,7 +3,7 @@
 #include <limits>
 #include <stdexcept>
 
-#include <base/baseN.hpp>
+#include <basen/baseN.hpp>
 
 static constexpr auto log256 = std::log(256);
 
diff --git a/src/hash/sha256.cpp b/src/hash/sha256.cpp
index b4ac8cd..63ad5df 100644
--- a/src/hash/sha256.cpp
+++ b/src/hash/sha256.cpp
@@ -15,7 +15,7 @@
 #include <memory.h>
 #include <stdlib.h>
 
-#include <base/hash/sha256.hpp>
+#include <basen/hash/sha256.hpp>
 
 #define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
 #define ROTRIGHT(a,b) (((a) >> (b)) | ((a) << (32-(b))))
diff --git a/src/hex.cpp b/src/hex.cpp
index 72d9ab8..29b67f8 100644
--- a/src/hex.cpp
+++ b/src/hex.cpp
@@ -1,8 +1,8 @@
 #include <limits>
 #include <stdexcept>
 
-#include <base/baseN.hpp>
-#include <base/hex.hpp>
+#include <basen/baseN.hpp>
+#include <basen/hex.hpp>
 
 namespace hex
 {
diff --git a/test/hash/test-sha256.cpp b/test/hash/test-sha256.cpp
index 391fda4..0f2dc9b 100644
--- a/test/hash/test-sha256.cpp
+++ b/test/hash/test-sha256.cpp
@@ -1,5 +1,5 @@
-#include <base/hash/sha256.hpp>
-#include <base/hex.hpp>
+#include <basen/hash/sha256.hpp>
+#include <basen/hex.hpp>
 #include <gtest/gtest.h>
 
 using namespace hash;
diff --git a/test/test-base58.cpp b/test/test-base58.cpp
index fd45628..3b2785f 100644
--- a/test/test-base58.cpp
+++ b/test/test-base58.cpp
@@ -1,7 +1,7 @@
 #include <utility>
 
-#include <base/base58.hpp>
-#include <base/hex.hpp>
+#include <basen/base58.hpp>
+#include <basen/hex.hpp>
 #include <gtest/gtest.h>
 
 using namespace base58;
diff --git a/test/test-base64.cpp b/test/test-base64.cpp
index 6ab15ec..f0877da 100644
--- a/test/test-base64.cpp
+++ b/test/test-base64.cpp
@@ -1,7 +1,7 @@
 #include <utility>
 
-#include <base/base64.hpp>
-#include <base/hex.hpp>
+#include <basen/base64.hpp>
+#include <basen/hex.hpp>
 #include <gtest/gtest.h>
 
 using namespace base64;
diff --git a/test/test-baseN.cpp b/test/test-baseN.cpp
index 8ddb77b..0e8950f 100644
--- a/test/test-baseN.cpp
+++ b/test/test-baseN.cpp
@@ -1,8 +1,8 @@
 #include <utility>
 
-#include <base/base58.hpp>
-#include <base/baseN.hpp>
-#include <base/hex.hpp>
+#include <basen/base58.hpp>
+#include <basen/baseN.hpp>
+#include <basen/hex.hpp>
 #include <gtest/gtest.h>
 
 using namespace baseN;
diff --git a/test/test-hex.cpp b/test/test-hex.cpp
index 68542e1..bd84488 100644
--- a/test/test-hex.cpp
+++ b/test/test-hex.cpp
@@ -1,4 +1,4 @@
-#include <base/hex.hpp>
+#include <basen/hex.hpp>
 #include <gtest/gtest.h>
 
 using namespace hex;