diff --git a/examples/ipv6/er-rest-example/Makefile b/examples/ipv6/er-rest-example/Makefile
index 076a2f59a..0cf493026 100644
--- a/examples/ipv6/er-rest-example/Makefile
+++ b/examples/ipv6/er-rest-example/Makefile
@@ -20,8 +20,8 @@ endif
 PROJECTDIRS += $(REST_RESOURCES_DIR)
 PROJECT_SOURCEFILES += $(REST_RESOURCES_FILES)
 
-# REST Engine shall use Erbium CoAP implementation
-APPS += er-coap
+# Include the CoAP implementation
+MODULES += os/net/app-layer/coap
 
 # optional rules to get assembly
 #CUSTOM_RULE_C_TO_OBJECTDIR_O = 1
diff --git a/examples/ipv6/er-rest-example/er-example-client.c b/examples/ipv6/er-rest-example/er-example-client.c
index fa3df6a22..5ef8f4fce 100644
--- a/examples/ipv6/er-rest-example/er-example-client.c
+++ b/examples/ipv6/er-rest-example/er-example-client.c
@@ -41,7 +41,7 @@
 #include <string.h>
 #include "contiki.h"
 #include "contiki-net.h"
-#include "er-coap-engine.h"
+#include "coap-engine.h"
 #include "dev/button-sensor.h"
 
 #define DEBUG 0
diff --git a/examples/ipv6/er-rest-example/resources/res-b1-sep-b2.c b/examples/ipv6/er-rest-example/resources/res-b1-sep-b2.c
index 7dcbdd0ca..26b6b8606 100644
--- a/examples/ipv6/er-rest-example/resources/res-b1-sep-b2.c
+++ b/examples/ipv6/er-rest-example/resources/res-b1-sep-b2.c
@@ -38,9 +38,9 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap-block1.h"
-#include "er-coap-separate.h"
-#include "er-coap-transactions.h"
+#include "coap-block1.h"
+#include "coap-separate.h"
+#include "coap-transactions.h"
 
 static void res_post_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 SEPARATE_RESOURCE(res_b1_sep_b2, "title=\"Block1 + Separate + Block2 demo\"", NULL, res_post_handler, NULL, NULL, NULL);
diff --git a/examples/ipv6/er-rest-example/resources/res-event.c b/examples/ipv6/er-rest-example/resources/res-event.c
index 7524d2ad2..149fdbdd7 100644
--- a/examples/ipv6/er-rest-example/resources/res-event.c
+++ b/examples/ipv6/er-rest-example/resources/res-event.c
@@ -38,7 +38,7 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
+#include "coap.h"
 
 #define DEBUG 0
 #if DEBUG
diff --git a/examples/ipv6/er-rest-example/resources/res-mirror.c b/examples/ipv6/er-rest-example/resources/res-mirror.c
index e33bda6d3..b7b74a118 100644
--- a/examples/ipv6/er-rest-example/resources/res-mirror.c
+++ b/examples/ipv6/er-rest-example/resources/res-mirror.c
@@ -38,7 +38,7 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
+#include "coap.h"
 
 #define DEBUG 0
 #if DEBUG
diff --git a/examples/ipv6/er-rest-example/resources/res-push.c b/examples/ipv6/er-rest-example/resources/res-push.c
index c169b407c..357a6a9f7 100644
--- a/examples/ipv6/er-rest-example/resources/res-push.c
+++ b/examples/ipv6/er-rest-example/resources/res-push.c
@@ -38,7 +38,7 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
+#include "coap.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 static void res_periodic_handler(void);
diff --git a/examples/ipv6/er-rest-example/resources/res-separate.c b/examples/ipv6/er-rest-example/resources/res-separate.c
index bb2248c92..fb402d2b9 100644
--- a/examples/ipv6/er-rest-example/resources/res-separate.c
+++ b/examples/ipv6/er-rest-example/resources/res-separate.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap-separate.h"
-#include "er-coap-transactions.h"
+#include "coap-separate.h"
+#include "coap-transactions.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 static void res_resume_handler(void);
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile b/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
index d8e099ed0..5c459e501 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/Makefile
@@ -16,8 +16,8 @@ PROJECT_SOURCEFILES += httpd-simple.c
 CONTIKI_WITH_IPV6 = 1
 
 # REST Engine shall use Erbium CoAP implementation
-APPS += er-coap
 MODULES += os/net/app-layer/mqtt
+MODULES += os/net/app-layer/coap
 
 CONTIKI=../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile b/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
index 09b036a4b..ab543b970 100644
--- a/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
+++ b/examples/platform-specific/cc26xx/very-sleepy-demo/Makefile
@@ -5,7 +5,7 @@ all: $(CONTIKI_PROJECT)
 
 CONTIKI_WITH_IPV6 = 1
 
-APPS += er-coap
+MODULES += os/net/app-layer/coap
 
 CONTIKI = ../../../..
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
index 743963472..3a586c304 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dongle-node/Makefile
@@ -15,6 +15,6 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap
+MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
index 6107de25c..f69d8775b 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1175-node/Makefile
@@ -15,6 +15,6 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap
+MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
index f12c10f4b..20fc2a6d4 100644
--- a/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
+++ b/examples/platform-specific/jn516x/rpl/coap-dr1199-node/Makefile
@@ -15,6 +15,6 @@ CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 
 CFLAGS += -DWITH_COAP
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap
+MODULES += os/net/app-layer/coap
 
 include $(CONTIKI)/Makefile.include
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
index 0c7ae71e1..bfd5f38f8 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/node/Makefile
@@ -13,8 +13,7 @@ PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap
-
+MODULES += os/net/app-layer/coap
 MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
 
 all: $(CONTIKI_PROJECT)
diff --git a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
index f400ee6af..b4c41af76 100644
--- a/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
+++ b/examples/platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/Makefile
@@ -15,8 +15,7 @@ PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap
-
+MODULES += os/net/app-layer/coap
 MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
 
 all: $(CONTIKI_PROJECT)
diff --git a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
index a9e1d813a..5398ac7ec 100644
--- a/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
+++ b/examples/platform-specific/jn516x/tsch/tx-power-verification/node/Makefile
@@ -13,8 +13,7 @@ PROJECT_SOURCEFILES += rpl-tools.c
 CFLAGS += -DWITH_COAP
 CFLAGS += -DREST=coap_rest_implementation
 CFLAGS += -DUIP_CONF_TCP=0
-APPS += er-coap
-
+MODULES += os/net/app-layer/coap
 MODULES += os/net/mac/tsch os/services/orchestra os/lib/json
 
 all: $(CONTIKI_PROJECT)