diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5860f010..d3b54d3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,17 +52,17 @@ endif()
 
 find_package(Doxygen)
 if( DOXYGEN_FOUND )
-    configure_file(${CMAKE_SOURCE_DIR}/etc/Doxyfile.in Doxyfile @ONLY )
+    configure_file(${CMAKE_SOURCE_DIR}/etc/Doxyfile.in Doxyfile @ONLY)
     add_custom_target(docs ALL
         Doxygen::doxygen Doxyfile
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "Generating API documentation with Doxygen" VERBATIM
     )
-    install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} )
-    install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR} )
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR})
+    install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif()
 
-add_subdirectory(libcdoc)
+add_subdirectory(cdoc)
 
 find_package(Boost COMPONENTS unit_test_framework QUIET)
 if (TARGET Boost::unit_test_framework)
diff --git a/libcdoc/CDoc.cpp b/cdoc/CDoc.cpp
similarity index 100%
rename from libcdoc/CDoc.cpp
rename to cdoc/CDoc.cpp
diff --git a/libcdoc/CDoc.h b/cdoc/CDoc.h
similarity index 100%
rename from libcdoc/CDoc.h
rename to cdoc/CDoc.h
diff --git a/libcdoc/CDoc1Reader.cpp b/cdoc/CDoc1Reader.cpp
similarity index 100%
rename from libcdoc/CDoc1Reader.cpp
rename to cdoc/CDoc1Reader.cpp
diff --git a/libcdoc/CDoc1Reader.h b/cdoc/CDoc1Reader.h
similarity index 100%
rename from libcdoc/CDoc1Reader.h
rename to cdoc/CDoc1Reader.h
diff --git a/libcdoc/CDoc1Writer.cpp b/cdoc/CDoc1Writer.cpp
similarity index 100%
rename from libcdoc/CDoc1Writer.cpp
rename to cdoc/CDoc1Writer.cpp
diff --git a/libcdoc/CDoc1Writer.h b/cdoc/CDoc1Writer.h
similarity index 100%
rename from libcdoc/CDoc1Writer.h
rename to cdoc/CDoc1Writer.h
diff --git a/libcdoc/CDoc2.h b/cdoc/CDoc2.h
similarity index 100%
rename from libcdoc/CDoc2.h
rename to cdoc/CDoc2.h
diff --git a/libcdoc/CDoc2Reader.cpp b/cdoc/CDoc2Reader.cpp
similarity index 100%
rename from libcdoc/CDoc2Reader.cpp
rename to cdoc/CDoc2Reader.cpp
diff --git a/libcdoc/CDoc2Reader.h b/cdoc/CDoc2Reader.h
similarity index 100%
rename from libcdoc/CDoc2Reader.h
rename to cdoc/CDoc2Reader.h
diff --git a/libcdoc/CDoc2Writer.cpp b/cdoc/CDoc2Writer.cpp
similarity index 100%
rename from libcdoc/CDoc2Writer.cpp
rename to cdoc/CDoc2Writer.cpp
diff --git a/libcdoc/CDoc2Writer.h b/cdoc/CDoc2Writer.h
similarity index 100%
rename from libcdoc/CDoc2Writer.h
rename to cdoc/CDoc2Writer.h
diff --git a/libcdoc/CDocChipher.cpp b/cdoc/CDocChipher.cpp
similarity index 100%
rename from libcdoc/CDocChipher.cpp
rename to cdoc/CDocChipher.cpp
diff --git a/libcdoc/CDocChipher.h b/cdoc/CDocChipher.h
similarity index 100%
rename from libcdoc/CDocChipher.h
rename to cdoc/CDocChipher.h
diff --git a/libcdoc/CDocException.java b/cdoc/CDocException.java
similarity index 83%
rename from libcdoc/CDocException.java
rename to cdoc/CDocException.java
index 11e05b19..82cc0fd0 100644
--- a/libcdoc/CDocException.java
+++ b/cdoc/CDocException.java
@@ -1,4 +1,4 @@
-package ee.ria.libcdoc;
+package ee.ria.cdoc;
 
 public class CDocException extends java.lang.Exception {
     CDocException(String msg) {
diff --git a/libcdoc/CDocReader.h b/cdoc/CDocReader.h
similarity index 97%
rename from libcdoc/CDocReader.h
rename to cdoc/CDocReader.h
index 03df5f8c..afa22a03 100644
--- a/libcdoc/CDocReader.h
+++ b/cdoc/CDocReader.h
@@ -20,12 +20,12 @@
  *
  */
 
-#include <libcdoc/Configuration.h>
-#include <libcdoc/CryptoBackend.h>
-#include <libcdoc/Exports.h>
-#include <libcdoc/Io.h>
-#include <libcdoc/Lock.h>
-#include <libcdoc/NetworkBackend.h>
+#include <cdoc/Configuration.h>
+#include <cdoc/CryptoBackend.h>
+#include <cdoc/Exports.h>
+#include <cdoc/Io.h>
+#include <cdoc/Lock.h>
+#include <cdoc/NetworkBackend.h>
 
 namespace libcdoc {
 
diff --git a/libcdoc/CDocWriter.h b/cdoc/CDocWriter.h
similarity index 95%
rename from libcdoc/CDocWriter.h
rename to cdoc/CDocWriter.h
index f747f273..cfcf6909 100644
--- a/libcdoc/CDocWriter.h
+++ b/cdoc/CDocWriter.h
@@ -20,13 +20,13 @@
  *
  */
 
-#include <libcdoc/Recipient.h>
-#include <libcdoc/Io.h>
+#include <cdoc/Recipient.h>
+#include <cdoc/Io.h>
 
-#include <libcdoc/Configuration.h>
-#include <libcdoc/CryptoBackend.h>
-#include <libcdoc/Exports.h>
-#include <libcdoc/NetworkBackend.h>
+#include <cdoc/Configuration.h>
+#include <cdoc/CryptoBackend.h>
+#include <cdoc/Exports.h>
+#include <cdoc/NetworkBackend.h>
 
 namespace libcdoc {
 
diff --git a/libcdoc/CMakeLists.txt b/cdoc/CMakeLists.txt
similarity index 91%
rename from libcdoc/CMakeLists.txt
rename to cdoc/CMakeLists.txt
index c1218022..073a238c 100644
--- a/libcdoc/CMakeLists.txt
+++ b/cdoc/CMakeLists.txt
@@ -83,7 +83,7 @@ set_target_properties(cdoc PROPERTIES
     PUBLIC_HEADER "${PUBLIC_HEADERS}"
     FRAMEWORK_VERSION 1
     FRAMEWORK "${FRAMEWORK}"
-    MACOSX_FRAMEWORK_IDENTIFIER "ee.ria.libcdoc"
+    MACOSX_FRAMEWORK_IDENTIFIER "ee.ria.cdoc"
     MACOSX_RPATH YES
     COMPILE_DEFINITIONS TARGET_NAME="$<TARGET_NAME:cdoc>"
 )
@@ -99,7 +99,7 @@ set_target_properties(cdoc_static PROPERTIES
     PUBLIC_HEADER "${PUBLIC_HEADERS}"
     FRAMEWORK_VERSION 1
     FRAMEWORK "${FRAMEWORK}"
-    MACOSX_FRAMEWORK_IDENTIFIER "ee.ria.libcdoc"
+    MACOSX_FRAMEWORK_IDENTIFIER "ee.ria.cdoc"
     MACOSX_RPATH YES
     COMPILE_DEFINITIONS TARGET_NAME="$<TARGET_NAME:cdoc>"
 )
@@ -134,7 +134,7 @@ if(SWIG_FOUND)
     if(JAVA_INCLUDE_PATH)
         file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/CDocException.java DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/java)
         file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/IStreamSource.java DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/java)
-        set(CMAKE_SWIG_FLAGS -package ee.ria.libcdoc)
+        set(CMAKE_SWIG_FLAGS -package ee.ria.cdoc)
         set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/java)
         swig_add_library(cdoc_java LANGUAGE java SOURCES ../libcdoc.i)
         target_include_directories(cdoc_java PRIVATE ${JAVA_INCLUDE_PATH} $<$<BOOL:${JAVA_INCLUDE_PATH2}>:${JAVA_INCLUDE_PATH2}>)
@@ -145,7 +145,7 @@ if(SWIG_FOUND)
             SWIG_COMPILE_DEFINITIONS $<$<PLATFORM_ID:Windows>:SWIGWIN>
         )
         install(TARGETS cdoc_java DESTINATION $<IF:$<PLATFORM_ID:Darwin>,/Library/Java/Extensions,${CMAKE_INSTALL_LIBDIR}>)
-        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ee/ria/libcdoc FILES_MATCHING PATTERN "*.java")
+        install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/java/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/ee/ria/cdoc FILES_MATCHING PATTERN "*.java")
         if(WIN32)
             install(FILES $<TARGET_PDB_FILE:cdoc_java> DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
         endif()
@@ -192,12 +192,12 @@ ${MODULE_LIST}
 endif()
 
 install(TARGETS cdoc
-    EXPORT libcdocExport
+    EXPORT cdocExport
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     RESOURCE DESTINATION ${CDOC_CONFIG_DIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcdoc
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cdoc
     FRAMEWORK DESTINATION ${FRAMEWORK_DESTINATION}
 )
 
@@ -207,19 +207,19 @@ install(TARGETS cdoc_static
 )
 
 if(NOT ANDROID)
-    install(EXPORT libcdocExport
-        FILE libcdoc-config.cmake
+    install(EXPORT cdocExport
+        FILE cdoc-config.cmake
         NAMESPACE cdoc::
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libcdoc
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cdoc
     )
     include(CMakePackageConfigHelpers)
     write_basic_package_version_file(
-        "${CMAKE_CURRENT_BINARY_DIR}/libcdoc-config-version.cmake"
+        ${CMAKE_CURRENT_BINARY_DIR}/cdoc-config-version.cmake
         VERSION ${PROJECT_VERSION}
         COMPATIBILITY AnyNewerVersion
     )
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libcdoc-config-version.cmake"
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libcdoc
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cdoc-config-version.cmake
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/cdoc
     )
 endif()
 
diff --git a/libcdoc/Certificate.cpp b/cdoc/Certificate.cpp
similarity index 100%
rename from libcdoc/Certificate.cpp
rename to cdoc/Certificate.cpp
diff --git a/libcdoc/Certificate.h b/cdoc/Certificate.h
similarity index 100%
rename from libcdoc/Certificate.h
rename to cdoc/Certificate.h
diff --git a/libcdoc/Configuration.h b/cdoc/Configuration.h
similarity index 97%
rename from libcdoc/Configuration.h
rename to cdoc/Configuration.h
index 78d6ff03..896a04a1 100644
--- a/libcdoc/Configuration.h
+++ b/cdoc/Configuration.h
@@ -20,8 +20,8 @@
  *
  */
 
-#include <libcdoc/Exports.h>
-#include <libcdoc/CDoc.h>
+#include <cdoc/Exports.h>
+#include <cdoc/CDoc.h>
 
 #include <cstdint>
 #include <string>
diff --git a/libcdoc/ConsoleLogger.h b/cdoc/ConsoleLogger.h
similarity index 100%
rename from libcdoc/ConsoleLogger.h
rename to cdoc/ConsoleLogger.h
diff --git a/libcdoc/Crypto.cpp b/cdoc/Crypto.cpp
similarity index 100%
rename from libcdoc/Crypto.cpp
rename to cdoc/Crypto.cpp
diff --git a/libcdoc/Crypto.h b/cdoc/Crypto.h
similarity index 100%
rename from libcdoc/Crypto.h
rename to cdoc/Crypto.h
diff --git a/libcdoc/CryptoBackend.cpp b/cdoc/CryptoBackend.cpp
similarity index 100%
rename from libcdoc/CryptoBackend.cpp
rename to cdoc/CryptoBackend.cpp
diff --git a/libcdoc/CryptoBackend.h b/cdoc/CryptoBackend.h
similarity index 98%
rename from libcdoc/CryptoBackend.h
rename to cdoc/CryptoBackend.h
index 1a7ab6e3..a251e256 100644
--- a/libcdoc/CryptoBackend.h
+++ b/cdoc/CryptoBackend.h
@@ -20,9 +20,9 @@
  *
  */
 
-#include <libcdoc/CDoc.h>
-#include <libcdoc/Exports.h>
-#include <libcdoc/Lock.h>
+#include <cdoc/CDoc.h>
+#include <cdoc/Exports.h>
+#include <cdoc/Lock.h>
 
 #include <cstdint>
 #include <string>
diff --git a/libcdoc/DDocReader.cpp b/cdoc/DDocReader.cpp
similarity index 100%
rename from libcdoc/DDocReader.cpp
rename to cdoc/DDocReader.cpp
diff --git a/libcdoc/DDocReader.h b/cdoc/DDocReader.h
similarity index 100%
rename from libcdoc/DDocReader.h
rename to cdoc/DDocReader.h
diff --git a/libcdoc/DDocWriter.cpp b/cdoc/DDocWriter.cpp
similarity index 100%
rename from libcdoc/DDocWriter.cpp
rename to cdoc/DDocWriter.cpp
diff --git a/libcdoc/DDocWriter.h b/cdoc/DDocWriter.h
similarity index 100%
rename from libcdoc/DDocWriter.h
rename to cdoc/DDocWriter.h
diff --git a/libcdoc/Exports.h b/cdoc/Exports.h
similarity index 100%
rename from libcdoc/Exports.h
rename to cdoc/Exports.h
diff --git a/libcdoc/ILogger.h b/cdoc/ILogger.h
similarity index 99%
rename from libcdoc/ILogger.h
rename to cdoc/ILogger.h
index afbac424..02f75675 100644
--- a/libcdoc/ILogger.h
+++ b/cdoc/ILogger.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <libcdoc/Exports.h>
+#include <cdoc/Exports.h>
 
 #ifdef __GNUC__
 #define FMT_HEADER_ONLY
diff --git a/libcdoc/IStreamSource.java b/cdoc/IStreamSource.java
similarity index 98%
rename from libcdoc/IStreamSource.java
rename to cdoc/IStreamSource.java
index 1b362cdb..8e5d5b22 100644
--- a/libcdoc/IStreamSource.java
+++ b/cdoc/IStreamSource.java
@@ -1,4 +1,4 @@
-package ee.ria.libcdoc;
+package ee.ria.cdoc;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/libcdoc/Io.cpp b/cdoc/Io.cpp
similarity index 100%
rename from libcdoc/Io.cpp
rename to cdoc/Io.cpp
diff --git a/libcdoc/Io.h b/cdoc/Io.h
similarity index 99%
rename from libcdoc/Io.h
rename to cdoc/Io.h
index 16e1487a..93a67f3c 100644
--- a/libcdoc/Io.h
+++ b/cdoc/Io.h
@@ -1,9 +1,9 @@
 #ifndef __IO_H__
 #define __IO_H__
 
-#include <libcdoc/Exports.h>
+#include <cdoc/Exports.h>
 
-#include <libcdoc/CDoc.h>
+#include <cdoc/CDoc.h>
 
 #include <cstdint>
 #include <filesystem>
diff --git a/libcdoc/Lock.cpp b/cdoc/Lock.cpp
similarity index 100%
rename from libcdoc/Lock.cpp
rename to cdoc/Lock.cpp
diff --git a/libcdoc/Lock.h b/cdoc/Lock.h
similarity index 99%
rename from libcdoc/Lock.h
rename to cdoc/Lock.h
index 4c14b070..a8367273 100644
--- a/libcdoc/Lock.h
+++ b/cdoc/Lock.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include <libcdoc/Exports.h>
+#include <cdoc/Exports.h>
 
 #include <cstdint>
 #include <string>
diff --git a/libcdoc/LogEngine.cpp b/cdoc/LogEngine.cpp
similarity index 100%
rename from libcdoc/LogEngine.cpp
rename to cdoc/LogEngine.cpp
diff --git a/libcdoc/NetworkBackend.cpp b/cdoc/NetworkBackend.cpp
similarity index 100%
rename from libcdoc/NetworkBackend.cpp
rename to cdoc/NetworkBackend.cpp
diff --git a/libcdoc/NetworkBackend.h b/cdoc/NetworkBackend.h
similarity index 97%
rename from libcdoc/NetworkBackend.h
rename to cdoc/NetworkBackend.h
index fd873332..27079f53 100644
--- a/libcdoc/NetworkBackend.h
+++ b/cdoc/NetworkBackend.h
@@ -20,9 +20,9 @@
  *
  */
 
-#include <libcdoc/CryptoBackend.h>
-#include <libcdoc/Exports.h>
-#include <libcdoc/Recipient.h>
+#include <cdoc/CryptoBackend.h>
+#include <cdoc/Exports.h>
+#include <cdoc/Recipient.h>
 
 #include <vector>
 
diff --git a/libcdoc/PKCS11Backend.cpp b/cdoc/PKCS11Backend.cpp
similarity index 100%
rename from libcdoc/PKCS11Backend.cpp
rename to cdoc/PKCS11Backend.cpp
diff --git a/libcdoc/PKCS11Backend.h b/cdoc/PKCS11Backend.h
similarity index 98%
rename from libcdoc/PKCS11Backend.h
rename to cdoc/PKCS11Backend.h
index 85eb8519..d5fdb920 100644
--- a/libcdoc/PKCS11Backend.h
+++ b/cdoc/PKCS11Backend.h
@@ -1,7 +1,7 @@
 #ifndef __PKCS11_BACKEND_H__
 #define __PKCS11_BACKEND_H__
 
-#include <libcdoc/CryptoBackend.h>
+#include <cdoc/CryptoBackend.h>
 
 #include <memory>
 
diff --git a/libcdoc/RcptInfo.h b/cdoc/RcptInfo.h
similarity index 100%
rename from libcdoc/RcptInfo.h
rename to cdoc/RcptInfo.h
diff --git a/libcdoc/Recipient.cpp b/cdoc/Recipient.cpp
similarity index 100%
rename from libcdoc/Recipient.cpp
rename to cdoc/Recipient.cpp
diff --git a/libcdoc/Recipient.h b/cdoc/Recipient.h
similarity index 99%
rename from libcdoc/Recipient.h
rename to cdoc/Recipient.h
index 0bacee79..1c93901c 100644
--- a/libcdoc/Recipient.h
+++ b/cdoc/Recipient.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include <libcdoc/Exports.h>
+#include <cdoc/Exports.h>
 
 #include <map>
 #include <string>
diff --git a/libcdoc/Tar.cpp b/cdoc/Tar.cpp
similarity index 100%
rename from libcdoc/Tar.cpp
rename to cdoc/Tar.cpp
diff --git a/libcdoc/Tar.h b/cdoc/Tar.h
similarity index 98%
rename from libcdoc/Tar.h
rename to cdoc/Tar.h
index d8a5f248..32d7d205 100644
--- a/libcdoc/Tar.h
+++ b/cdoc/Tar.h
@@ -1,7 +1,7 @@
 #ifndef TAR_H
 #define TAR_H
 
-#include <libcdoc/Io.h>
+#include <cdoc/Io.h>
 
 #include <cstring>
 #include <string>
diff --git a/libcdoc/ToolConf.h b/cdoc/ToolConf.h
similarity index 100%
rename from libcdoc/ToolConf.h
rename to cdoc/ToolConf.h
diff --git a/libcdoc/Utils.cpp b/cdoc/Utils.cpp
similarity index 100%
rename from libcdoc/Utils.cpp
rename to cdoc/Utils.cpp
diff --git a/libcdoc/Utils.h b/cdoc/Utils.h
similarity index 100%
rename from libcdoc/Utils.h
rename to cdoc/Utils.h
diff --git a/libcdoc/WinBackend.cpp b/cdoc/WinBackend.cpp
similarity index 100%
rename from libcdoc/WinBackend.cpp
rename to cdoc/WinBackend.cpp
diff --git a/libcdoc/WinBackend.h b/cdoc/WinBackend.h
similarity index 97%
rename from libcdoc/WinBackend.h
rename to cdoc/WinBackend.h
index 2f0ab74c..b669c466 100644
--- a/libcdoc/WinBackend.h
+++ b/cdoc/WinBackend.h
@@ -1,7 +1,7 @@
 #ifndef __LIBCDOC_WINBACKEND_H__
 #define __LIBCDOC_WINBACKEND_H__
 
-#include <libcdoc/CryptoBackend.h>
+#include <cdoc/CryptoBackend.h>
 
 #include <memory>
 
diff --git a/libcdoc/Wrapper.h b/cdoc/Wrapper.h
similarity index 100%
rename from libcdoc/Wrapper.h
rename to cdoc/Wrapper.h
diff --git a/libcdoc/XmlReader.cpp b/cdoc/XmlReader.cpp
similarity index 100%
rename from libcdoc/XmlReader.cpp
rename to cdoc/XmlReader.cpp
diff --git a/libcdoc/XmlReader.h b/cdoc/XmlReader.h
similarity index 100%
rename from libcdoc/XmlReader.h
rename to cdoc/XmlReader.h
diff --git a/libcdoc/XmlWriter.cpp b/cdoc/XmlWriter.cpp
similarity index 100%
rename from libcdoc/XmlWriter.cpp
rename to cdoc/XmlWriter.cpp
diff --git a/libcdoc/XmlWriter.h b/cdoc/XmlWriter.h
similarity index 100%
rename from libcdoc/XmlWriter.h
rename to cdoc/XmlWriter.h
diff --git a/libcdoc/ZStream.cpp b/cdoc/ZStream.cpp
similarity index 100%
rename from libcdoc/ZStream.cpp
rename to cdoc/ZStream.cpp
diff --git a/libcdoc/ZStream.h b/cdoc/ZStream.h
similarity index 100%
rename from libcdoc/ZStream.h
rename to cdoc/ZStream.h
diff --git a/libcdoc/cdoc-tool.cpp b/cdoc/cdoc-tool.cpp
similarity index 100%
rename from libcdoc/cdoc-tool.cpp
rename to cdoc/cdoc-tool.cpp
diff --git a/libcdoc/fmt/base.h b/cdoc/fmt/base.h
similarity index 100%
rename from libcdoc/fmt/base.h
rename to cdoc/fmt/base.h
diff --git a/libcdoc/fmt/format-inl.h b/cdoc/fmt/format-inl.h
similarity index 100%
rename from libcdoc/fmt/format-inl.h
rename to cdoc/fmt/format-inl.h
diff --git a/libcdoc/fmt/format.h b/cdoc/fmt/format.h
similarity index 100%
rename from libcdoc/fmt/format.h
rename to cdoc/fmt/format.h
diff --git a/libcdoc/httplib.h b/cdoc/httplib.h
similarity index 100%
rename from libcdoc/httplib.h
rename to cdoc/httplib.h
diff --git a/libcdoc/json.hpp b/cdoc/json.hpp
similarity index 100%
rename from libcdoc/json.hpp
rename to cdoc/json.hpp
diff --git a/libcdoc/pkcs11.h b/cdoc/pkcs11.h
similarity index 100%
rename from libcdoc/pkcs11.h
rename to cdoc/pkcs11.h
diff --git a/libcdoc/schema/header.fbs b/cdoc/schema/header.fbs
similarity index 100%
rename from libcdoc/schema/header.fbs
rename to cdoc/schema/header.fbs
diff --git a/libcdoc/schema/recipients.fbs b/cdoc/schema/recipients.fbs
similarity index 100%
rename from libcdoc/schema/recipients.fbs
rename to cdoc/schema/recipients.fbs
diff --git a/debian/libcdoc-dev.install b/debian/libcdoc-dev.install
index 0b9d997d..7bb05c26 100644
--- a/debian/libcdoc-dev.install
+++ b/debian/libcdoc-dev.install
@@ -1,5 +1,6 @@
-usr/include/libcdoc/
-usr/include/ee/ria/libcdoc/*
-usr/include/cdoc_csharp/*
+usr/include/cdoc
+usr/include/ee/ria/cdoc
+usr/include/cdoc_csharp
 usr/lib/*/libcdoc.so
 usr/lib/*/cmake
+usr/share/doc/libcdoc
\ No newline at end of file
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index 1a9c49cc..00000000
--- a/debian/not-installed
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/libcdoc/*
diff --git a/etc/Doxyfile.in b/etc/Doxyfile.in
index a0f83892..78518ff2 100644
--- a/etc/Doxyfile.in
+++ b/etc/Doxyfile.in
@@ -943,9 +943,9 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-#INPUT                  = @CMAKE_SOURCE_DIR@/libcdoc \
-#                         @CMAKE_SOURCE_DIR@/libcdoc.dox
-INPUT                  = @CMAKE_SOURCE_DIR@/libcdoc
+#INPUT                  = @CMAKE_SOURCE_DIR@/cdoc \
+#                         @CMAKE_SOURCE_DIR@/cdoc.dox
+INPUT                  = @CMAKE_SOURCE_DIR@/cdoc
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/examples/java/build.gradle b/examples/java/build.gradle
index 34ce1a08..97622361 100755
--- a/examples/java/build.gradle
+++ b/examples/java/build.gradle
@@ -12,6 +12,6 @@ base {
 }
 jar {
     manifest {
-        attributes 'Main-Class': 'ee.ria.libcdoc.CDocTool'
+        attributes 'Main-Class': 'ee.ria.cdoc.CDocTool'
     }
 }
diff --git a/examples/java/src/main/java/ee/ria/libcdoc/CDocTool.java b/examples/java/src/main/java/ee/ria/libcdoc/CDocTool.java
index b4173692..1c191139 100644
--- a/examples/java/src/main/java/ee/ria/libcdoc/CDocTool.java
+++ b/examples/java/src/main/java/ee/ria/libcdoc/CDocTool.java
@@ -1,4 +1,4 @@
-package ee.ria.libcdoc;
+package ee.ria.cdoc;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/libcdoc.i b/libcdoc.i
index e7b158f2..8dba4892 100644
--- a/libcdoc.i
+++ b/libcdoc.i
@@ -62,7 +62,7 @@
     $action;
     if (result < 0) {
         std::string err_str = arg1->getLastErrorStr();
-        jclass clazz = jenv->FindClass("ee/ria/libcdoc/CDocException");
+        jclass clazz = jenv->FindClass("ee/ria/cdoc/CDocException");
         jenv->ThrowNew(clazz, err_str.c_str());
         return $null;
     }
@@ -188,8 +188,8 @@
 %}
 %typemap(in) std::vector<uint8_t>& dst %{
     // DataBuffer in
-    jclass $1_class = jenv->FindClass("ee/ria/libcdoc/DataBuffer");
-    jmethodID $1_mid = jenv->GetStaticMethodID($1_class, "getCPtr", "(Lee/ria/libcdoc/DataBuffer;)J");
+    jclass $1_class = jenv->FindClass("ee/ria/cdoc/DataBuffer");
+    jmethodID $1_mid = jenv->GetStaticMethodID($1_class, "getCPtr", "(Lee/ria/cdoc/DataBuffer;)J");
     jlong $1_cptr = jenv->CallStaticLongMethod($1_class, $1_mid, $input);
     libcdoc::DataBuffer *$1_db = (libcdoc::DataBuffer *) $1_cptr;
     $1 = $1_db->data;
@@ -199,7 +199,7 @@
 %typemap(jni) std::vector<uint8_t>& dst "jobject"
 %typemap(javaout) std::vector<uint8_t>& dst "$jnicall"
 %typemap(javain) std::vector<uint8_t>& dst "$javainput"
-%typemap(directorin,descriptor="Lee/ria/libcdoc/DataBuffer;") std::vector<uint8_t>& dst %{
+%typemap(directorin,descriptor="Lee/ria/cdoc/DataBuffer;") std::vector<uint8_t>& dst %{
     // DataBuffer directorin
 
     // Use scope guard to reset DataBuffer after Java call
@@ -209,7 +209,7 @@
     };
     std::unique_ptr<libcdoc::DataBuffer, decltype(del)> $1_db(new libcdoc::DataBuffer(&$1), del);
 
-    jclass buf_class = jenv->FindClass("ee/ria/libcdoc/DataBuffer");
+    jclass buf_class = jenv->FindClass("ee/ria/cdoc/DataBuffer");
     jmethodID mid = jenv->GetMethodID(buf_class, "<init>", "(JZ)V");
     jobject obj = jenv->NewObject(buf_class, mid, (jlong) $1_db.get(), JNI_FALSE);
     $input = obj;
@@ -278,8 +278,8 @@
 %typemap(in) std::vector<std::vector<uint8_t>>& %{
     // CertificateList in
     std::cerr << "%typemap(in) std::vector<std::vector<uint8_t>>&" << std::endl;
-    jclass $1_class = jenv->FindClass("ee/ria/libcdoc/CertificateList");
-    jmethodID $1_mid = jenv->GetStaticMethodID($1_class, "getCPtr", "(Lee/ria/libcdoc/CertificateList;)J");
+    jclass $1_class = jenv->FindClass("ee/ria/cdoc/CertificateList");
+    jmethodID $1_mid = jenv->GetStaticMethodID($1_class, "getCPtr", "(Lee/ria/cdoc/CertificateList;)J");
     jlong $1_cptr = jenv->CallStaticLongMethod($1_class, $1_mid, $input);
     libcdoc::CertificateList *$1_db = (libcdoc::CertificateList *) $1_cptr;
     $1 = $1_db->data;
@@ -292,7 +292,7 @@
 %typemap(jni) std::vector<std::vector<uint8_t>>& "jobject"
 %typemap(javain) std::vector<std::vector<uint8_t>>& "$javainput"
 
-%typemap(directorin,descriptor="Lee/ria/libcdoc/CertificateList;") std::vector<std::vector<uint8_t>>& %{
+%typemap(directorin,descriptor="Lee/ria/cdoc/CertificateList;") std::vector<std::vector<uint8_t>>& %{
     // CertificateList directorin
 
     // Use scope guard to reset CertificateList after Java call
@@ -302,7 +302,7 @@
     };
     std::unique_ptr<libcdoc::CertificateList, decltype(del)> $1_db(new libcdoc::CertificateList(&$1), del);
 
-    jclass buf_class = jenv->FindClass("ee/ria/libcdoc/CertificateList");
+    jclass buf_class = jenv->FindClass("ee/ria/cdoc/CertificateList");
     jmethodID mid = jenv->GetMethodID(buf_class, "<init>", "(JZ)V");
     jobject obj = jenv->NewObject(buf_class, mid, (jlong) $1_db.get(), JNI_FALSE);
     $input = obj;