diff --git a/doc/build-system.txt b/doc/build-system.txt
index 1fe49940d..ce6346afd 100644
--- a/doc/build-system.txt
+++ b/doc/build-system.txt
@@ -44,24 +44,23 @@
  microcontroller architecture used on the platform for which Contiki
  is built): rules for the CPU architecture, located in the CPU
  architecture's subdirectory in the cpu/ directory.
- - <tt>Makefile.\$(APP)</tt> (where \$(APP) is the name of an
- application in the apps/ directory): rules for applications in the
- apps/ directories. Each application has its own makefile.
+ - <tt>Makefile.\$(MODULE)</tt> (where \$(MODULE) is the name of a
+ module in the Contiki directory): rules for modules in the
+ Contiki directories. Each module might have its own optional makefile.
 
  The Makefile in the project's directory is intentionally simple. It
  specifies where the Contiki source code resides in the system and
  includes the system-wide Makefile, <tt>Makefile.include</tt>. The
- project's makefile can also define in the <tt>APPS</tt> variable a
- list of applications from the apps/ directory that should be included
- in the Contiki system. The Makefile used in the hello-world example
- project looks like this:
+ project's makefile can also define in the <tt>MODULES</tt> variable a
+ list of modules that should be included in the Contiki system.
+ The Makefile used in the hello-world example project looks like this:
 
  \code
 CONTIKI = ../..
 all: hello-world
 include $(CONTIKI)/Makefile.include
  \endcode
- 
+
  First, the location of the Contiki source code tree is given by
  defining the <tt>CONTIKI</tt> variable. Next, the name of the
  application is defined. Finally, the system-wide
@@ -71,7 +70,7 @@ include $(CONTIKI)/Makefile.include
  the core Contiki system. <tt>Makefile.include</tt> always reside in
  the root of the Contiki source tree. When <tt>make</tt> is run,
  <tt>Makefile.include</tt> includes the <tt>Makefile.\$(TARGET)</tt>
- as well as all makefiles for the applications in the <tt>APPS</tt>
+ as well as all makefiles for the modules in the <tt>MODULES</tt>
  list (which is specified by the project's <tt>Makefile</tt>).
 
  <tt>Makefile.\$(TARGET)</tt>, which is located in the
@@ -86,11 +85,10 @@ include $(CONTIKI)/Makefile.include
  used, the <tt>Makefile.\$(CPU)</tt> can either contain a conditional
  expression that allows different C compilers to be defined, or it can
  be completely overridden by the platform specific makefile
- <tt>Makefile.\$(TARGET)</tt>. 
+ <tt>Makefile.\$(TARGET)</tt>.
 @{
  */
 
  /**
  @}
  */
- 
diff --git a/examples/ipv6/er-rest-example/Makefile b/examples/ipv6/coap-example/Makefile
similarity index 93%
rename from examples/ipv6/er-rest-example/Makefile
rename to examples/ipv6/coap-example/Makefile
index 0cf493026..55152d782 100644
--- a/examples/ipv6/er-rest-example/Makefile
+++ b/examples/ipv6/coap-example/Makefile
@@ -1,5 +1,5 @@
-all: er-example-server er-example-client
-# use target "er-plugtest-server" explicitly when requried
+all: coap-example-server coap-example-client
+# use target "plugtest-server" explicitly when required
 
 CONTIKI=../../..
 
diff --git a/examples/ipv6/er-rest-example/README.md b/examples/ipv6/coap-example/README.md
similarity index 83%
rename from examples/ipv6/er-rest-example/README.md
rename to examples/ipv6/coap-example/README.md
index 25abd60e4..bd884b52f 100644
--- a/examples/ipv6/er-rest-example/README.md
+++ b/examples/ipv6/coap-example/README.md
@@ -4,13 +4,13 @@ A Quick Introduction to the Erbium (Er) REST Engine
 EXAMPLE FILES
 -------------
 
-- er-example-server.c: A RESTful server example showing how to use the REST
+- coap-example-server.c: A RESTful server example showing how to use the REST
   layer to develop server-side applications (at the moment only CoAP is
   implemented for the REST Engine).
-- er-example-client.c: A CoAP client that polls the /actuators/toggle resource
+- coap-example-client.c: A CoAP client that polls the /actuators/toggle resource
   every 10 seconds and cycles through 4 resources on button press (target
   address is hard-coded).
-- er-plugtest-server.c: The server used for draft compliance testing at ETSI
+- plugtest-server.c: The server used for draft compliance testing at ETSI
   IoT CoAP Plugtests. Erbium (Er) participated in Paris, France, March 2012 and
   Sophia-Antipolis, France, November 2012 (configured for minimal-net).
 
@@ -66,7 +66,7 @@ TMOTES HOWTO
 
 1. Connect two Tmote Skys (check with $ make TARGET=sky sky-motelist)
 
-        make TARGET=sky er-example-server.upload MOTE=2
+        make TARGET=sky coap-example-server.upload MOTE=2
         make TARGET=sky login MOTE=2
 
 2. Press reset button, get address, abort with Ctrl+C:
@@ -86,21 +86,21 @@ TMOTES HOWTO
 
 ### Add a client:
 
-1. Change the hard-coded server address in er-example-client.c to fd00::____:____:____:____
+1. Change the hard-coded server address in coap-example-client.c to fd00::____:____:____:____
 2. Connect a third Tmote Sky
 
-        make TARGET=sky er-example-client.upload MOTE=3
+        make TARGET=sky coap-example-client.upload MOTE=3
 
 MINIMAL-NET HOWTO
 -----------------
 
 With the target minimal-net you can test your CoAP applications without
 constraints, i.e., with large buffers, debug output, memory protection, etc.
-The er-plugtest-server is thought for the minimal-net platform, as it requires
+The plugtest-server is thought for the minimal-net platform, as it requires
 an 1280-byte IP buffer and 1024-byte blocks.
 
-        make TARGET=minimal-net er-plugtest-server
-        sudo ./er-plugtest-server.minimal-net
+        make TARGET=minimal-net plugtest-server
+        sudo ./plugtest-server.minimal-net
 
 Open new terminal
 
@@ -127,11 +127,11 @@ DETAILS
 -------
 
 Erbium implements the Proposed Standard of CoAP. Central features are commented
-in er-example-server.c.  In general, apps/er-coap supports:
+in coap-example-server.c.  In general, coap supports:
 
 - All draft-18 header options
 - CON Retransmissions (note COAP_MAX_OPEN_TRANSACTIONS)
-- Blockwise Transfers (note REST_MAX_CHUNK_SIZE, see er-plugtest-server.c for
+- Blockwise Transfers (note REST_MAX_CHUNK_SIZE, see plugtest-server.c for
   Block1 uploads)
 - Separate Responses (no rest_set_pre_handler() required anymore, note
   coap_separate_accept(), _reject(), and _resume())
diff --git a/examples/ipv6/er-rest-example/er-example-client.c b/examples/ipv6/coap-example/coap-example-client.c
similarity index 100%
rename from examples/ipv6/er-rest-example/er-example-client.c
rename to examples/ipv6/coap-example/coap-example-client.c
diff --git a/examples/ipv6/er-rest-example/er-example-observe-client.c b/examples/ipv6/coap-example/coap-example-observe-client.c
similarity index 99%
rename from examples/ipv6/er-rest-example/er-example-observe-client.c
rename to examples/ipv6/coap-example/coap-example-observe-client.c
index c950fdfd7..6d6b0c5cb 100644
--- a/examples/ipv6/er-rest-example/er-example-observe-client.c
+++ b/examples/ipv6/coap-example/coap-example-observe-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"
 
 /*----------------------------------------------------------------------------*/
diff --git a/examples/ipv6/er-rest-example/er-example-server.c b/examples/ipv6/coap-example/coap-example-server.c
similarity index 100%
rename from examples/ipv6/er-rest-example/er-example-server.c
rename to examples/ipv6/coap-example/coap-example-server.c
diff --git a/examples/ipv6/er-rest-example/in6addr.patch b/examples/ipv6/coap-example/in6addr.patch
similarity index 100%
rename from examples/ipv6/er-rest-example/in6addr.patch
rename to examples/ipv6/coap-example/in6addr.patch
diff --git a/examples/ipv6/er-rest-example/er-plugtest-server.c b/examples/ipv6/coap-example/plugtest-server.c
similarity index 97%
rename from examples/ipv6/er-rest-example/er-plugtest-server.c
rename to examples/ipv6/coap-example/plugtest-server.c
index ae637dc4c..c6c0e534f 100644
--- a/examples/ipv6/er-rest-example/er-plugtest-server.c
+++ b/examples/ipv6/coap-example/plugtest-server.c
@@ -41,11 +41,11 @@
 #include <string.h>
 #include "contiki.h"
 #include "contiki-net.h"
-#include "er-coap.h"
-#include "er-coap-transactions.h"
-#include "er-coap-separate.h"
+#include "coap.h"
+#include "coap-transactions.h"
+#include "coap-separate.h"
 #include "rest-engine.h"
-#include "er-plugtest.h"
+#include "plugtest.h"
 
 /*
  * Resources to be activated need to be imported through the extern keyword.
diff --git a/examples/ipv6/er-rest-example/er-plugtest.h b/examples/ipv6/coap-example/plugtest.h
similarity index 97%
rename from examples/ipv6/er-rest-example/er-plugtest.h
rename to examples/ipv6/coap-example/plugtest.h
index 0b156656a..78b168d4b 100644
--- a/examples/ipv6/er-rest-example/er-plugtest.h
+++ b/examples/ipv6/coap-example/plugtest.h
@@ -36,8 +36,8 @@
  *      Matthias Kovatsch <kovatsch@inf.ethz.ch>
  */
 
-#ifndef __ER_PLUGTEST_H__
-#define __ER_PLUGTEST_H__
+#ifndef PLUGTEST_H_
+#define PLUGTEST_H_
 
 #if !defined(CONTIKI_TARGET_NATIVE)
 #warning "Should only be compiled for native!"
@@ -63,4 +63,4 @@
 #define MAX_PLUGFEST_BODY    2048
 #define CHUNKS_TOTAL         2012
 
-#endif /* __ER_PLUGTEST_H__ */
+#endif /* PLUGTEST_H_ */
diff --git a/examples/ipv6/er-rest-example/project-conf.h b/examples/ipv6/coap-example/project-conf.h
similarity index 100%
rename from examples/ipv6/er-rest-example/project-conf.h
rename to examples/ipv6/coap-example/project-conf.h
diff --git a/examples/ipv6/er-rest-example/resources/res-b1-sep-b2.c b/examples/ipv6/coap-example/resources/res-b1-sep-b2.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-b1-sep-b2.c
rename to examples/ipv6/coap-example/resources/res-b1-sep-b2.c
diff --git a/examples/ipv6/er-rest-example/resources/res-battery.c b/examples/ipv6/coap-example/resources/res-battery.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-battery.c
rename to examples/ipv6/coap-example/resources/res-battery.c
diff --git a/examples/ipv6/er-rest-example/resources/res-chunks.c b/examples/ipv6/coap-example/resources/res-chunks.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-chunks.c
rename to examples/ipv6/coap-example/resources/res-chunks.c
diff --git a/examples/ipv6/er-rest-example/resources/res-event.c b/examples/ipv6/coap-example/resources/res-event.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-event.c
rename to examples/ipv6/coap-example/resources/res-event.c
diff --git a/examples/ipv6/er-rest-example/resources/res-hello.c b/examples/ipv6/coap-example/resources/res-hello.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-hello.c
rename to examples/ipv6/coap-example/resources/res-hello.c
diff --git a/examples/ipv6/er-rest-example/resources/res-leds.c b/examples/ipv6/coap-example/resources/res-leds.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-leds.c
rename to examples/ipv6/coap-example/resources/res-leds.c
diff --git a/examples/ipv6/er-rest-example/resources/res-light.c b/examples/ipv6/coap-example/resources/res-light.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-light.c
rename to examples/ipv6/coap-example/resources/res-light.c
diff --git a/examples/ipv6/er-rest-example/resources/res-mirror.c b/examples/ipv6/coap-example/resources/res-mirror.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-mirror.c
rename to examples/ipv6/coap-example/resources/res-mirror.c
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-create1.c b/examples/ipv6/coap-example/resources/res-plugtest-create1.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-create1.c
rename to examples/ipv6/coap-example/resources/res-plugtest-create1.c
index 4ba5f6181..4e8c52231 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-create1.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-create1.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 static void res_delete_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-create2.c b/examples/ipv6/coap-example/resources/res-plugtest-create2.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-create2.c
rename to examples/ipv6/coap-example/resources/res-plugtest-create2.c
index 25877ac70..714432ff6 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-create2.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-create2.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_post_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-create3.c b/examples/ipv6/coap-example/resources/res-plugtest-create3.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-create3.c
rename to examples/ipv6/coap-example/resources/res-plugtest-create3.c
index 2498c065a..fe7526eba 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-create3.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-create3.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 static void res_delete_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-large-create.c b/examples/ipv6/coap-example/resources/res-plugtest-large-create.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-large-create.c
rename to examples/ipv6/coap-example/resources/res-plugtest-large-create.c
index 888dfaa31..ac1e27a3d 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-large-create.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-large-create.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_post_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-large-update.c b/examples/ipv6/coap-example/resources/res-plugtest-large-update.c
similarity index 99%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-large-update.c
rename to examples/ipv6/coap-example/resources/res-plugtest-large-update.c
index 12c7d1e9f..8cb8fcbc7 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-large-update.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-large-update.c
@@ -39,8 +39,8 @@
 #include <string.h>
 #include "sys/cc.h"
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 static void res_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-large.c b/examples/ipv6/coap-example/resources/res-plugtest-large.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-large.c
rename to examples/ipv6/coap-example/resources/res-plugtest-large.c
index d997dd927..5571db7ec 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-large.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-large.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-links.c b/examples/ipv6/coap-example/resources/res-plugtest-links.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-links.c
rename to examples/ipv6/coap-example/resources/res-plugtest-links.c
index be68aadf7..f802d3c56 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-links.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-links.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-locquery.c b/examples/ipv6/coap-example/resources/res-plugtest-locquery.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-locquery.c
rename to examples/ipv6/coap-example/resources/res-plugtest-locquery.c
index 64e79ff25..1525d466b 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-locquery.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-locquery.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_post_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-longpath.c b/examples/ipv6/coap-example/resources/res-plugtest-longpath.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-longpath.c
rename to examples/ipv6/coap-example/resources/res-plugtest-longpath.c
index d6c4fb855..5a26d4db9 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-longpath.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-longpath.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-multi.c b/examples/ipv6/coap-example/resources/res-plugtest-multi.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-multi.c
rename to examples/ipv6/coap-example/resources/res-plugtest-multi.c
index 281a2268f..c6592b397 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-multi.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-multi.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-obs.c b/examples/ipv6/coap-example/resources/res-plugtest-obs.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-obs.c
rename to examples/ipv6/coap-example/resources/res-plugtest-obs.c
index e202c2043..5d0b94a99 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-obs.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-obs.c
@@ -38,9 +38,9 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-coap-observe.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "coap-observe.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 static void res_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-path.c b/examples/ipv6/coap-example/resources/res-plugtest-path.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-path.c
rename to examples/ipv6/coap-example/resources/res-plugtest-path.c
index 3566a51b9..03eb362bb 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-path.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-path.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-query.c b/examples/ipv6/coap-example/resources/res-plugtest-query.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-query.c
rename to examples/ipv6/coap-example/resources/res-plugtest-query.c
index 538646c6e..6ffbccbbb 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-query.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-query.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-separate.c b/examples/ipv6/coap-example/resources/res-plugtest-separate.c
similarity index 98%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-separate.c
rename to examples/ipv6/coap-example/resources/res-plugtest-separate.c
index a32311bba..b45841ec1 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-separate.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-separate.c
@@ -38,10 +38,10 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-coap-transactions.h"
-#include "er-coap-separate.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "coap-transactions.h"
+#include "coap-separate.h"
+#include "plugtest.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/ipv6/er-rest-example/resources/res-plugtest-test.c b/examples/ipv6/coap-example/resources/res-plugtest-test.c
similarity index 99%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-test.c
rename to examples/ipv6/coap-example/resources/res-plugtest-test.c
index 27bba1f3b..7e70626eb 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-test.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-test.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 static void res_post_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
diff --git a/examples/ipv6/er-rest-example/resources/res-plugtest-validate.c b/examples/ipv6/coap-example/resources/res-plugtest-validate.c
similarity index 99%
rename from examples/ipv6/er-rest-example/resources/res-plugtest-validate.c
rename to examples/ipv6/coap-example/resources/res-plugtest-validate.c
index b92ffe74d..042ceb1fa 100644
--- a/examples/ipv6/er-rest-example/resources/res-plugtest-validate.c
+++ b/examples/ipv6/coap-example/resources/res-plugtest-validate.c
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include "rest-engine.h"
-#include "er-coap.h"
-#include "er-plugtest.h"
+#include "coap.h"
+#include "plugtest.h"
 
 static void res_get_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
 static void res_put_handler(void *request, void *response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset);
diff --git a/examples/ipv6/er-rest-example/resources/res-push.c b/examples/ipv6/coap-example/resources/res-push.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-push.c
rename to examples/ipv6/coap-example/resources/res-push.c
diff --git a/examples/ipv6/er-rest-example/resources/res-radio.c b/examples/ipv6/coap-example/resources/res-radio.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-radio.c
rename to examples/ipv6/coap-example/resources/res-radio.c
diff --git a/examples/ipv6/er-rest-example/resources/res-separate.c b/examples/ipv6/coap-example/resources/res-separate.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-separate.c
rename to examples/ipv6/coap-example/resources/res-separate.c
diff --git a/examples/ipv6/er-rest-example/resources/res-sht11.c b/examples/ipv6/coap-example/resources/res-sht11.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-sht11.c
rename to examples/ipv6/coap-example/resources/res-sht11.c
diff --git a/examples/ipv6/er-rest-example/resources/res-sub.c b/examples/ipv6/coap-example/resources/res-sub.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-sub.c
rename to examples/ipv6/coap-example/resources/res-sub.c
diff --git a/examples/ipv6/er-rest-example/resources/res-temperature.c b/examples/ipv6/coap-example/resources/res-temperature.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-temperature.c
rename to examples/ipv6/coap-example/resources/res-temperature.c
diff --git a/examples/ipv6/er-rest-example/resources/res-toggle.c b/examples/ipv6/coap-example/resources/res-toggle.c
similarity index 100%
rename from examples/ipv6/er-rest-example/resources/res-toggle.c
rename to examples/ipv6/coap-example/resources/res-toggle.c
diff --git a/examples/ipv6/er-rest-example/server-client-native.csc b/examples/ipv6/coap-example/server-client-native.csc
similarity index 93%
rename from examples/ipv6/er-rest-example/server-client-native.csc
rename to examples/ipv6/coap-example/server-client-native.csc
index 500332c8f..d61cc89b0 100644
--- a/examples/ipv6/er-rest-example/server-client-native.csc
+++ b/examples/ipv6/coap-example/server-client-native.csc
@@ -1,4 +1,4 @@
-examples/ipv6/er-rest-example<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <simconf>
   <project EXPORT="discard">[APPS_DIR]/mrm</project>
   <project EXPORT="discard">[APPS_DIR]/mspsim</project>
@@ -48,9 +48,9 @@ examples/ipv6/er-rest-example<?xml version="1.0" encoding="UTF-8"?>
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.c</source>
-      <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.sky</firmware>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.c</source>
+      <commands EXPORT="discard">make coap-example-server.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@ examples/ipv6/er-rest-example<?xml version="1.0" encoding="UTF-8"?>
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-client.c</source>
-      <commands EXPORT="discard">make er-example-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-client.sky</firmware>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-client.c</source>
+      <commands EXPORT="discard">make coap-example-client.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/examples/ipv6/er-rest-example/server-client-observe.csc b/examples/ipv6/coap-example/server-client-observe.csc
similarity index 93%
rename from examples/ipv6/er-rest-example/server-client-observe.csc
rename to examples/ipv6/coap-example/server-client-observe.csc
index bf03a4ad6..ebedb70b9 100644
--- a/examples/ipv6/er-rest-example/server-client-observe.csc
+++ b/examples/ipv6/coap-example/server-client-observe.csc
@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.c</source>
-      <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.sky</firmware>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.c</source>
+      <commands EXPORT="discard">make coap-example-server.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-observe-client.c</source>
-      <commands EXPORT="discard">make er-example-observe-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-observe-client.sky</firmware>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-observe-client.c</source>
+      <commands EXPORT="discard">make coap-example-observe-client.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-observe-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/examples/ipv6/er-rest-example/server-client.csc b/examples/ipv6/coap-example/server-client.csc
similarity index 94%
rename from examples/ipv6/er-rest-example/server-client.csc
rename to examples/ipv6/coap-example/server-client.csc
index 1b13e2d05..8e8e75a09 100644
--- a/examples/ipv6/er-rest-example/server-client.csc
+++ b/examples/ipv6/coap-example/server-client.csc
@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.c</source>
-      <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.sky</firmware>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.c</source>
+      <commands EXPORT="discard">make coap-example-server.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -71,9 +71,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>client</identifier>
       <description>Erbium Client</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-client.c</source>
-      <commands EXPORT="discard">make er-example-client.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-client.sky</firmware>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-client.c</source>
+      <commands EXPORT="discard">make coap-example-client.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-client.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/examples/ipv6/er-rest-example/server-only.csc b/examples/ipv6/coap-example/server-only.csc
similarity index 96%
rename from examples/ipv6/er-rest-example/server-only.csc
rename to examples/ipv6/coap-example/server-only.csc
index de0ce129d..473b78357 100644
--- a/examples/ipv6/er-rest-example/server-only.csc
+++ b/examples/ipv6/coap-example/server-only.csc
@@ -48,9 +48,9 @@
       org.contikios.cooja.mspmote.SkyMoteType
       <identifier>server</identifier>
       <description>Erbium Server</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.c</source>
-      <commands EXPORT="discard">make er-example-server.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/er-rest-example/er-example-server.sky</firmware>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.c</source>
+      <commands EXPORT="discard">make coap-example-server.sky TARGET=sky</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/coap-example/coap-example-server.sky</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c
index 68693b737..2dccd1b75 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-ble-advd.c
@@ -37,7 +37,7 @@
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "rest-engine.h"
-#include "er-coap.h"
+#include "coap.h"
 #include "rf-core/rf-ble.h"
 
 #include <string.h>
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c
index 62e8dc6dc..a52557ffe 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-device.c
@@ -38,7 +38,7 @@
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "rest-engine.h"
-#include "er-coap.h"
+#include "coap.h"
 #include "sys/clock.h"
 #include "coap-server.h"
 #include "cc26xx-web-demo.h"
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c
index 1a5ce7b81..86346a999 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-net.c
@@ -38,7 +38,7 @@
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "rest-engine.h"
-#include "er-coap.h"
+#include "coap.h"
 #include "coap-server.h"
 #include "cc26xx-web-demo.h"
 
diff --git a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c
index f3fd7bd26..b5fe9adb9 100644
--- a/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c
+++ b/examples/platform-specific/cc26xx/cc26xx-web-demo/resources/res-sensors.c
@@ -38,7 +38,7 @@
 /*---------------------------------------------------------------------------*/
 #include "contiki.h"
 #include "rest-engine.h"
-#include "er-coap.h"
+#include "coap.h"
 #include "cc26xx-web-demo.h"
 #include "coap-server.h"