diff --git a/examples/avr-rss2/ipv6/dc-rpl-coap/coap-client.c b/examples/avr-rss2/ipv6/dc-rpl-coap/coap-client.c
index afd81cad4..8c89fd8f2 100644
--- a/examples/avr-rss2/ipv6/dc-rpl-coap/coap-client.c
+++ b/examples/avr-rss2/ipv6/dc-rpl-coap/coap-client.c
@@ -172,7 +172,7 @@ set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -183,23 +183,23 @@ set_global_address(void)
  *
  * For correct Wireshark decoding using a sniffer, add the /64 prefix to the
  * 6LowPAN protocol preferences,
- * e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and
+ * e.g. set Context 0 to fd00::. At present Wireshark copies Context/128 and
  * then overwrites it.
- * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit
- * compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit
+ * compressed address of fd00::1111:22ff:fe33:xxxx)
  *
  * Note the IPCMV6 checksum verification depends on the correct uncompressed addresses.
  */
 
 #if 0
 /* Mode 1 - 64 bits inline */
-  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+  uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
 #elif 1
 /* Mode 2 - 16 bits inline */
-  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+  uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
 #else
 /* Mode 3 - derived from server link-local (MAC) address */
-  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); /* redbee-econotag */
+  uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); /* redbee-econotag */
 #endif
 /* Voravit Added */
 /*      PRINTF("VORAVIT CLIENT: SERVER IPv6 addresses: \n"); */
diff --git a/examples/avr-rss2/ipv6/dc-rpl-coap/coap-server.c b/examples/avr-rss2/ipv6/dc-rpl-coap/coap-server.c
index 75ba90e71..f5addaedc 100644
--- a/examples/avr-rss2/ipv6/dc-rpl-coap/coap-server.c
+++ b/examples/avr-rss2/ipv6/dc-rpl-coap/coap-server.c
@@ -227,21 +227,21 @@ PROCESS_THREAD(coap_server_process, ev, data)
  * 6LowPAN protocol preferences,
  * e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and
  * then overwrites it.
- * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit
- * compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit
+ * compressed address of fd00::1111:22ff:fe33:xxxx)
  * Note Wireshark's IPCMV6 checksum verification depends on the correct
  * uncompressed addresses.
  */
 
 #if 0
 /* Mode 1 - 64 bits inline */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
 #elif 1
 /* Mode 2 - 16 bits inline */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
 #else
 /* Mode 3 - derived from link local (MAC) address */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
 #endif
 
@@ -250,7 +250,7 @@ PROCESS_THREAD(coap_server_process, ev, data)
   if(root_if != NULL) {
     rpl_dag_t *dag;
     dag = rpl_set_root(RPL_DEFAULT_INSTANCE, (uip_ip6addr_t *)&ipaddr);
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &ipaddr, 64);
     PRINTF("created a new RPL dag\n");
   } else {
diff --git a/examples/avr-rss2/ipv6/rpl-border-router/border-router.c b/examples/avr-rss2/ipv6/rpl-border-router/border-router.c
index 6a992982f..8050daf80 100644
--- a/examples/avr-rss2/ipv6/rpl-border-router/border-router.c
+++ b/examples/avr-rss2/ipv6/rpl-border-router/border-router.c
@@ -370,7 +370,7 @@ PROCESS_THREAD(border_router_process, ev, data)
   NETSTACK_MAC.off(1);
 
 /* Derived from link local (MAC) address */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   set_prefix_64(&ipaddr);
   print_local_addresses();
 
diff --git a/examples/avr-rss2/ipv6/rpl-udp-report/report.c b/examples/avr-rss2/ipv6/rpl-udp-report/report.c
index 406c494ee..adb237f58 100644
--- a/examples/avr-rss2/ipv6/rpl-udp-report/report.c
+++ b/examples/avr-rss2/ipv6/rpl-udp-report/report.c
@@ -143,7 +143,7 @@ set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
 
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 
@@ -153,10 +153,10 @@ set_global_address(void)
  *
  * For correct Wireshark decoding using a sniffer, add the /64 prefix to the
  * 6LowPAN protocol preferences,
- * e.g. set Context 0 to aaaa::. At present Wireshark copies Context/128 and
+ * e.g. set Context 0 to fd00::. At present Wireshark copies Context/128 and
  * then overwrites it.
- * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit
- * compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit
+ * compressed address of fd00::1111:22ff:fe33:xxxx)
  *
  * Note the IPCMV6 checksum verification depends on the correct uncompressed
  * addresses.
@@ -164,13 +164,13 @@ set_global_address(void)
  
 #if 0
 /* Mode 1 - 64 bits inline */
-   uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+   uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
 #elif 1
 /* Mode 2 - 16 bits inline */
-  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+  uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
 #else
 /* Mode 3 - derived from server link-local (MAC) address */
-  uip_ip6addr(&server_ipaddr, 0xaaaa, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); //redbee-econotag
+  uip_ip6addr(&server_ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0x0250, 0xc2ff, 0xfea8, 0xcd1a); //redbee-econotag
 #endif
 }
 /*---------------------------------------------------------------------------*/
diff --git a/examples/avr-rss2/ipv6/rpl-udp-report/sink.c b/examples/avr-rss2/ipv6/rpl-udp-report/sink.c
index babc14703..cf9ba947f 100644
--- a/examples/avr-rss2/ipv6/rpl-udp-report/sink.c
+++ b/examples/avr-rss2/ipv6/rpl-udp-report/sink.c
@@ -124,21 +124,21 @@ PROCESS_THREAD(udp_server_process, ev, data)
  * 6LowPAN protocol preferences,
  * e.g. set Context 0 to aaaa::.  At present Wireshark copies Context/128 and
  * then overwrites it.
- * (Setting Context 0 to aaaa::1111:2222:3333:4444 will report a 16 bit
- * compressed address of aaaa::1111:22ff:fe33:xxxx)
+ * (Setting Context 0 to fd00::1111:2222:3333:4444 will report a 16 bit
+ * compressed address of fd00::1111:22ff:fe33:xxxx)
  * Note Wireshark's IPCMV6 checksum verification depends on the correct
  * uncompressed addresses.
  */
  
 #if 0
 /* Mode 1 - 64 bits inline */
-   uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 1);
+   uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 1);
 #elif 1
 /* Mode 2 - 16 bits inline */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0x00ff, 0xfe00, 1);
 #else
 /* Mode 3 - derived from link local (MAC) address */
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
 #endif
 
@@ -147,7 +147,7 @@ PROCESS_THREAD(udp_server_process, ev, data)
   if(root_if != NULL) {
     rpl_dag_t *dag;
     dag = rpl_set_root(RPL_DEFAULT_INSTANCE,(uip_ip6addr_t *)&ipaddr);
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &ipaddr, 64);
     PRINTF("created a new RPL dag\n");
   } else {
diff --git a/examples/avr-rss2/ipv6/sensd_client/sensd_client.c b/examples/avr-rss2/ipv6/sensd_client/sensd_client.c
index df6494031..3d0871b1b 100644
--- a/examples/avr-rss2/ipv6/sensd_client/sensd_client.c
+++ b/examples/avr-rss2/ipv6/sensd_client/sensd_client.c
@@ -118,7 +118,7 @@ static void
 set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 }
diff --git a/examples/avr-rss2/ipv6/sensd_client/server.c b/examples/avr-rss2/ipv6/sensd_client/server.c
index c2dea4514..ce2b5217e 100644
--- a/examples/avr-rss2/ipv6/sensd_client/server.c
+++ b/examples/avr-rss2/ipv6/sensd_client/server.c
@@ -70,7 +70,7 @@ static void
 set_global_address(void)
 {
   uip_ipaddr_t ipaddr;
-  uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+  uip_ip6addr(&ipaddr, UIP_DS6_DEFAULT_PREFIX, 0, 0, 0, 0, 0, 0, 0);
   uip_ds6_set_addr_iid(&ipaddr, &uip_lladdr);
   uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 }
diff --git a/platform/avr-rss2/contiki-main.c b/platform/avr-rss2/contiki-main.c
index 8abac4d04..a079c5a55 100644
--- a/platform/avr-rss2/contiki-main.c
+++ b/platform/avr-rss2/contiki-main.c
@@ -376,7 +376,7 @@ initialize(void)
 #if 0
   {
     uip_ip6addr_t ipaddr;
-    uip_ip6addr(&ipaddr, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
+    uip_ip6addr(&ipaddr, 0xfd00, 0, 0, 0, 0, 0, 0, 0);
     uip_ds6_addr_add(&ipaddr, 0, ADDR_AUTOCONF);
 /*  uip_ds6_prefix_add(&ipaddr,64,0); */
   }