diff --git a/tools/cooja/contiki_tests/sky_ipv6_udp.csc b/tools/cooja/contiki_tests/sky_ipv6_udp.csc
index 1ec513ee9..9c96011fe 100644
--- a/tools/cooja/contiki_tests/sky_ipv6_udp.csc
+++ b/tools/cooja/contiki_tests/sky_ipv6_udp.csc
@@ -20,10 +20,10 @@
se.sics.cooja.mspmote.SkyMoteType
sky1
Sky Mote Type #1
- ../../../examples/udp-sender-ipv6/example-udp-sender.c
+ ../../../examples/udp-ipv6/udp-client.c
make clean TARGET=sky
-make example-udp-sender.sky TARGET=sky DEFINES=WITH_UIP6,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7402,UDP_ADDR_G=0x02,UDP_ADDR_H=0x202
- ../../../examples/udp-sender-ipv6/example-udp-sender.sky
+make udp-client.sky TARGET=sky DEFINES=WITH_UIP6,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7402,UDP_ADDR_G=0x02,UDP_ADDR_H=0x202
+ ../../../examples/udp-ipv6/udp-client.sky
se.sics.cooja.interfaces.Position
se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
@@ -39,10 +39,10 @@ make example-udp-sender.sky TARGET=sky DEFINES=WITH_UIP6,UDP_ADDR_A=0xfe80,UDP_A
se.sics.cooja.mspmote.SkyMoteType
sky2
Sky Mote Type #2
- ../../../examples/udp-receiver-ipv6/example-udp-receiver.c
+ ../../../examples/udp-ipv6/udp-server.c
make clean TARGET=sky
-make example-udp-receiver.sky TARGET=sky DEFINES=WITH_UIP6,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7401,UDP_ADDR_G=0x01,UDP_ADDR_H=0x101
- ../../../examples/udp-receiver-ipv6/example-udp-receiver.sky
+make udp-server.sky TARGET=sky DEFINES=WITH_UIP6,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7401,UDP_ADDR_G=0x01,UDP_ADDR_H=0x101
+ ../../../examples/udp-ipv6/udp-server.sky
se.sics.cooja.interfaces.Position
se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
@@ -125,21 +125,21 @@ make example-udp-receiver.sky TARGET=sky DEFINES=WITH_UIP6,UDP_ADDR_A=0xfe80,UDP