diff --git a/.gitignore b/.gitignore
index 199ab59da8..6a428212a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,7 +83,7 @@ examples/coap-tiny
 examples/*.exe
 
 # the include/ folder
-include/coap2/coap.h
+include/coap3/coap.h
 
 # the tests/ folder
 tests/.deps
diff --git a/autogen.sh b/autogen.sh
index 72f8273e6e..d326f2baf6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -27,7 +27,7 @@ depcomp
 doc/Doxyfile doc/doxyfile.stamp doc/doxygen_sqlite3.db doc/Makefile doc/Makefile.in
 examples/*.o  examples/coap-client examples/coap-server examples/coap-rd
 examples/Makefile examples/Makefile.in
-include/coap2/coap.h
+include/coap3/coap.h
 install-sh
 libcoap-*.pc libtool ltmain.sh
 man/coap*.[357] man/coap*.txt man/Makefile man/Makefile.in
diff --git a/build-env/Dockerfile.develop b/build-env/Dockerfile.develop
index 5d4d84a802..3f83e0ab23 100644
--- a/build-env/Dockerfile.develop
+++ b/build-env/Dockerfile.develop
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y autoconf automake gcc g++ gdb libtool l
 RUN apt-get install -y iproute2 lsof net-tools inetutils-ping netcat-openbsd less vim
 RUN apt-get clean
 
-COPY --from=0 /usr/local/include/coap2 /usr/local/include/coap2
+COPY --from=0 /usr/local/include/coap3 /usr/local/include/coap3
 COPY --from=0 /usr/local/lib /usr/local/lib
 COPY --from=0 /usr/local/bin/coap-client /usr/local/bin/
 COPY --from=0 /usr/local/include/cn-cbor /usr/local/include/cn-cbor
diff --git a/libcoap-3.map b/libcoap-3.map
index c05ebcd1c6..bd043fed5d 100644
--- a/libcoap-3.map
+++ b/libcoap-3.map
@@ -1,4 +1,4 @@
-VER_2 {
+VER_3 {
 global:
   coap_add_attr;
   coap_add_block;
diff --git a/src/coap_gnutls.c b/src/coap_gnutls.c
index 757b0d2a51..48e7932d31 100644
--- a/src/coap_gnutls.c
+++ b/src/coap_gnutls.c
@@ -386,7 +386,7 @@ coap_dtls_get_tls(const coap_session_t *c_session,
     *tls_lib = COAP_TLS_LIBRARY_GNUTLS;
   if (c_session && c_session->tls) {
     const coap_gnutls_env_t *g_env = (const coap_gnutls_env_t *)c_session->tls;
-   
+
     return g_env->g_session;
   }
   return NULL;
diff --git a/src/coap_mbedtls.c b/src/coap_mbedtls.c
index 73d82d7265..bada857ce5 100644
--- a/src/coap_mbedtls.c
+++ b/src/coap_mbedtls.c
@@ -1947,7 +1947,7 @@ coap_dtls_get_tls(const coap_session_t *c_session,
 
     /* To get around const issue */
     memcpy(&m_env, &c_session->tls, sizeof(m_env));
-    
+
     return (void *)&m_env->ssl;
   }
   return NULL;
diff --git a/src/coap_tinydtls.c b/src/coap_tinydtls.c
index 15c1e1e259..c99f0b3690 100644
--- a/src/coap_tinydtls.c
+++ b/src/coap_tinydtls.c
@@ -59,7 +59,7 @@ coap_dtls_get_tls(const coap_session_t *c_session,
   if (c_session && c_session->context && c_session->context->dtls_context) {
     const coap_tiny_context_t *t_context =
                   (const coap_tiny_context_t *)c_session->context->dtls_context;
-    
+
     return t_context->dtls_context;
   }
   return NULL;