diff --git a/examples/zolertia/z1/ipv6/z1-websense/Makefile b/examples/zolertia/z1/ipv6/z1-websense/Makefile
index 45cd84bea..717802ae9 100644
--- a/examples/zolertia/z1/ipv6/z1-websense/Makefile
+++ b/examples/zolertia/z1/ipv6/z1-websense/Makefile
@@ -1,14 +1,14 @@
 all: z1-websense
 
-CONTIKI=../../../../..
+CONTIKI = ../../../../..
 
-SMALL=1
+SMALL = 1
 
 APPS += webserver webbrowser
 
 CFLAGS += -DPROJECT_CONF_H=\"project-conf.h\"
 CONTIKI_SOURCEFILES += wget.c
-PROJECTDIRS += ../../../ipv6/rpl-border-router
+PROJECTDIRS += ../../../../ipv6/rpl-border-router
 PROJECT_SOURCEFILES += httpd-simple.c
 
 CONTIKI_WITH_IPV6 = 1
diff --git a/examples/zolertia/z1/ipv6/z1-websense/Makefile.target b/examples/zolertia/z1/ipv6/z1-websense/Makefile.target
new file mode 100644
index 000000000..ff66066d4
--- /dev/null
+++ b/examples/zolertia/z1/ipv6/z1-websense/Makefile.target
@@ -0,0 +1 @@
+TARGET = z1
diff --git a/examples/zolertia/z1/ipv6/z1-websense/README.md b/examples/zolertia/z1/ipv6/z1-websense/README.md
index c3883bb00..af373adc6 100644
--- a/examples/zolertia/z1/ipv6/z1-websense/README.md
+++ b/examples/zolertia/z1/ipv6/z1-websense/README.md
@@ -18,6 +18,7 @@ To test the example in COOJA under Linux
     make connect-router-cooja
 
 3. You should now be able to browse to the nodes using your web browser:
+
    Router: http://[aaaa::0212:7401:0001:0101]/
    Node 2: http://[aaaa::0212:7402:0002:0202]/
 
@@ -31,7 +32,7 @@ To run the example on real nodes under Linux
 
 2. Disconnect the nodes and program one node with the RPL border router
 
-    cd ../rpl-border-router && make TARGET=z1 border-router.upload
+    cd examples/ipv6/rpl-border-router && make TARGET=z1 border-router.upload
 
 3. Connect to the border router using tunslip6:
 
diff --git a/examples/zolertia/z1/ipv6/z1-websense/example-sky-websense.csc b/examples/zolertia/z1/ipv6/z1-websense/example-z1-websense.csc
similarity index 79%
rename from examples/zolertia/z1/ipv6/z1-websense/example-sky-websense.csc
rename to examples/zolertia/z1/ipv6/z1-websense/example-z1-websense.csc
index f226357e1..87a20f781 100644
--- a/examples/zolertia/z1/ipv6/z1-websense/example-sky-websense.csc
+++ b/examples/zolertia/z1/ipv6/z1-websense/example-z1-websense.csc
@@ -5,7 +5,7 @@
   <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
   <project EXPORT="discard">[CONTIKI_DIR]/tools/cooja/apps/serial_socket</project>
   <simulation>
-    <title>Sky Websense with RPL router</title>
+    <title>Z1 Websense with RPL router</title>
     <delaytime>0</delaytime>
     <randomseed>123456</randomseed>
     <motedelay_us>1000000</motedelay_us>
@@ -20,12 +20,12 @@
       <logoutput>40000</logoutput>
     </events>
     <motetype>
-      org.contikios.cooja.mspmote.SkyMoteType
+      org.contikios.cooja.mspmote.Z1MoteType
       <identifier>rplroot</identifier>
-      <description>Sky RPL Root</description>
+      <description>Z1 RPL Root</description>
       <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.c</source>
-      <commands EXPORT="discard">make border-router.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.sky</firmware>
+      <commands EXPORT="discard">make border-router.z1 TARGET=z1</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/rpl-border-router/border-router.z1</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -33,22 +33,19 @@
       <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyButton</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyFlash</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspButton</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspLED</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
     </motetype>
     <motetype>
-      org.contikios.cooja.mspmote.SkyMoteType
-      <identifier>skyweb</identifier>
-      <description>Sky Websense</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/ipv6/sky-websense/sky-websense.c</source>
-      <commands EXPORT="discard">make sky-websense.sky TARGET=sky</commands>
-      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/ipv6/sky-websense/sky-websense.sky</firmware>
+      org.contikios.cooja.mspmote.Z1MoteType
+      <identifier>Z1web</identifier>
+      <description>Z1 Websense</description>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/zolertia/z1/ipv6/z1-websense/z1-websense.c</source>
+      <commands EXPORT="discard">make z1-websense.z1 TARGET=z1</commands>
+      <firmware EXPORT="copy">[CONTIKI_DIR]/examples/zolertia/z1/ipv6/z1-websense/z1-websense.z1</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.RimeAddress</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.IPAddress</moteinterface>
@@ -56,14 +53,11 @@
       <moteinterface>org.contikios.cooja.interfaces.MoteAttributes</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspClock</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspMoteID</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyButton</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyFlash</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspButton</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspSerial</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyLED</moteinterface>
+      <moteinterface>org.contikios.cooja.mspmote.interfaces.MspLED</moteinterface>
       <moteinterface>org.contikios.cooja.mspmote.interfaces.MspDebugOutput</moteinterface>
-      <moteinterface>org.contikios.cooja.mspmote.interfaces.SkyTemperature</moteinterface>
     </motetype>
     <mote>
       <breakpoints />
@@ -91,7 +85,7 @@
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>2</id>
       </interface_config>
-      <motetype_identifier>skyweb</motetype_identifier>
+      <motetype_identifier>Z1web</motetype_identifier>
     </mote>
     <mote>
       <breakpoints />
@@ -105,7 +99,7 @@
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>3</id>
       </interface_config>
-      <motetype_identifier>skyweb</motetype_identifier>
+      <motetype_identifier>Z1web</motetype_identifier>
     </mote>
     <mote>
       <breakpoints />
@@ -119,7 +113,7 @@
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>4</id>
       </interface_config>
-      <motetype_identifier>skyweb</motetype_identifier>
+      <motetype_identifier>Z1web</motetype_identifier>
     </mote>
     <mote>
       <breakpoints />
@@ -133,7 +127,7 @@
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>5</id>
       </interface_config>
-      <motetype_identifier>skyweb</motetype_identifier>
+      <motetype_identifier>Z1web</motetype_identifier>
     </mote>
     <mote>
       <breakpoints />
@@ -147,7 +141,7 @@
         org.contikios.cooja.mspmote.interfaces.MspMoteID
         <id>6</id>
       </interface_config>
-      <motetype_identifier>skyweb</motetype_identifier>
+      <motetype_identifier>Z1web</motetype_identifier>
     </mote>
   </simulation>
   <plugin>