diff --git a/lib/contiki-core/sys/cc.h b/lib/contiki-core/sys/cc.h
index 39df9bc56..b6da95803 100644
--- a/lib/contiki-core/sys/cc.h
+++ b/lib/contiki-core/sys/cc.h
@@ -46,7 +46,7 @@
 #ifndef CC_H_
 #define CC_H_
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 #include "sys/cc-gcc.h"
 
 /**
diff --git a/lib/contiki-core/sys/clock.h b/lib/contiki-core/sys/clock.h
index 95f89cb7e..610305b3e 100644
--- a/lib/contiki-core/sys/clock.h
+++ b/lib/contiki-core/sys/clock.h
@@ -70,7 +70,7 @@
 #ifndef CLOCK_H_
 #define CLOCK_H_
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 /**
  * A second, measured in system clock time.
diff --git a/lib/contiki-core/sys/compower.c b/lib/contiki-core/sys/compower.c
index 2ce0c3c5d..21254a83c 100644
--- a/lib/contiki-core/sys/compower.c
+++ b/lib/contiki-core/sys/compower.c
@@ -43,7 +43,7 @@
  * @{
  */
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 #include "sys/energest.h"
 #include "sys/compower.h"
 #include "net/packetbuf.h"
diff --git a/lib/contiki-core/sys/energest.c b/lib/contiki-core/sys/energest.c
index f9365b4e8..ac2b9a3ae 100644
--- a/lib/contiki-core/sys/energest.c
+++ b/lib/contiki-core/sys/energest.c
@@ -39,7 +39,7 @@
  */
 
 #include "sys/energest.h"
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 #if ENERGEST_CONF_ON
 
diff --git a/lib/contiki-core/sys/etimer.c b/lib/contiki-core/sys/etimer.c
index 9a19f6207..76e549e77 100644
--- a/lib/contiki-core/sys/etimer.c
+++ b/lib/contiki-core/sys/etimer.c
@@ -45,7 +45,7 @@
  * Adam Dunkels <adam@sics.se>
  */
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 #include "sys/etimer.h"
 #include "sys/process.h"
diff --git a/lib/contiki-core/sys/log.h b/lib/contiki-core/sys/log.h
index d163ef9ff..6a7592e9e 100644
--- a/lib/contiki-core/sys/log.h
+++ b/lib/contiki-core/sys/log.h
@@ -35,7 +35,7 @@
 #ifndef LOG_H_
 #define LOG_H_
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 #if LOG_CONF_ENABLED
 void log_message(const char *part1, const char *part2);
diff --git a/lib/contiki-core/sys/rtimer.h b/lib/contiki-core/sys/rtimer.h
index de01cc076..735cffb6f 100644
--- a/lib/contiki-core/sys/rtimer.h
+++ b/lib/contiki-core/sys/rtimer.h
@@ -54,7 +54,7 @@
 #ifndef RTIMER_H_
 #define RTIMER_H_
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 #ifndef RTIMER_CLOCK_DIFF
 typedef unsigned short rtimer_clock_t;
diff --git a/lib/contiki-core/sys/stimer.c b/lib/contiki-core/sys/stimer.c
index d21672b07..7014617de 100644
--- a/lib/contiki-core/sys/stimer.c
+++ b/lib/contiki-core/sys/stimer.c
@@ -45,7 +45,7 @@
  * @{
  */
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 #include "sys/clock.h"
 #include "sys/stimer.h"
 
diff --git a/lib/contiki-core/sys/timer.c b/lib/contiki-core/sys/timer.c
index abb7cab68..7a7289a48 100644
--- a/lib/contiki-core/sys/timer.c
+++ b/lib/contiki-core/sys/timer.c
@@ -45,7 +45,7 @@
  * @{
  */
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 #include "sys/clock.h"
 #include "sys/timer.h"
 
diff --git a/lib/pbio/platform/city_hub/pbio-conf.h b/lib/pbio/platform/city_hub/contiki-conf.h
similarity index 100%
rename from lib/pbio/platform/city_hub/pbio-conf.h
rename to lib/pbio/platform/city_hub/contiki-conf.h
diff --git a/lib/pbio/platform/cplus_hub/pbio-conf.h b/lib/pbio/platform/cplus_hub/contiki-conf.h
similarity index 100%
rename from lib/pbio/platform/cplus_hub/pbio-conf.h
rename to lib/pbio/platform/cplus_hub/contiki-conf.h
diff --git a/lib/pbio/platform/debug/pbio-conf.h b/lib/pbio/platform/debug/contiki-conf.h
similarity index 100%
rename from lib/pbio/platform/debug/pbio-conf.h
rename to lib/pbio/platform/debug/contiki-conf.h
diff --git a/lib/pbio/platform/ev3dev_stretch/pbio-conf.h b/lib/pbio/platform/ev3dev_stretch/contiki-conf.h
similarity index 100%
rename from lib/pbio/platform/ev3dev_stretch/pbio-conf.h
rename to lib/pbio/platform/ev3dev_stretch/contiki-conf.h
diff --git a/lib/pbio/platform/move_hub/pbio-conf.h b/lib/pbio/platform/move_hub/contiki-conf.h
similarity index 100%
rename from lib/pbio/platform/move_hub/pbio-conf.h
rename to lib/pbio/platform/move_hub/contiki-conf.h
diff --git a/lib/pbio/platform/nxt/pbio-conf.h b/lib/pbio/platform/nxt/contiki-conf.h
similarity index 100%
rename from lib/pbio/platform/nxt/pbio-conf.h
rename to lib/pbio/platform/nxt/contiki-conf.h