diff --git a/core/include/msg.h b/core/include/msg.h
index fe9792caf68ddabbe21172a0f0e067ce0534f97f..8a58bb26a953903ef4d0e0d58f406fb369537b65 100644
--- a/core/include/msg.h
+++ b/core/include/msg.h
@@ -1,5 +1,5 @@
 /**
- *  There are two ways to use the IPC Messaging system of µkleos. The default is synchronous
+ *  There are two ways to use the IPC Messaging system of RIOT. The default is synchronous
  *  messaging. In this manner, messages are either dropped when the receiver is not waiting and the
  *  message was sent non-blocking, or will be delivered immediately when the receiver calls
  *  msg_receive(msg_t* m). To use asynchronous messaging any thread can create its own queue by
diff --git a/core/kernel_init.c b/core/kernel_init.c
index 6af76399cf9f0d9c97182a2fa49d1d534c8f037c..3124ce65f5eabc324b1ea3682107a9c80c9deb68 100644
--- a/core/kernel_init.c
+++ b/core/kernel_init.c
@@ -68,7 +68,7 @@ static char idle_stack[KERNEL_CONF_STACKSIZE_IDLE];
 void kernel_init(void)
 {
     dINT();
-    printf("kernel_init(): This is ukleos!\n");
+    printf("kernel_init(): This is RIOT!\n");
     
     sched_init();
 
diff --git a/core/sched.c b/core/sched.c
index fd905db895b81d969e933f7bf3abc0d10f87d4ea..120e818156eec53ef31ae01b2fdbec2b3d92c2c5 100644
--- a/core/sched.c
+++ b/core/sched.c
@@ -1,5 +1,5 @@
 /**
- * The µkleos scheduler implementation
+ * The RIOT scheduler implementation
  *
  * Copyright (C) 2010 Freie Universität Berlin
  *
diff --git a/cpu/arm_common/bootloader.c b/cpu/arm_common/bootloader.c
index f68a75e07b7d794be7c43745a91de3b8657edc14..ae3b72b57cddb6af975651885dc35a0c67ff5d4c 100644
--- a/cpu/arm_common/bootloader.c
+++ b/cpu/arm_common/bootloader.c
@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/arm_common/include/arm_common.h b/cpu/arm_common/include/arm_common.h
index b4fa4994925b3c71b517f2daf28fa401392fb2dc..0e40e7e632264dd644ff770a2f18908d465ea5c1 100644
--- a/cpu/arm_common/include/arm_common.h
+++ b/cpu/arm_common/include/arm_common.h
@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/arm_common/syscalls.c b/cpu/arm_common/syscalls.c
index 14dcda90a12e9e438ae018f25743052d2aca83e4..fa79909da4b327a8cbeb1d5be87aa975500c872f 100644
--- a/cpu/arm_common/syscalls.c
+++ b/cpu/arm_common/syscalls.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/cc430/cc430-gpioint.c b/cpu/cc430/cc430-gpioint.c
index 56cdbf1511851a56ecedfc0fd222a8f3260a091c..6775b81f9e3e26903eb580ddabbc7d5b46367300 100644
--- a/cpu/cc430/cc430-gpioint.c
+++ b/cpu/cc430/cc430-gpioint.c
@@ -4,14 +4,14 @@ Copyright 2010, Freie Universität Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of µkleos.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/cc430/cc430-rtc.c b/cpu/cc430/cc430-rtc.c
index 8d2b43fcb75d21965643201194b368fed66c7e8b..f37de3732855d2b242722b3a0e492c14660f47bf 100644
--- a/cpu/cc430/cc430-rtc.c
+++ b/cpu/cc430/cc430-rtc.c
@@ -4,14 +4,14 @@ Copyright 2010, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of µkleos.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/cc430/include/cc430-rtc.h b/cpu/cc430/include/cc430-rtc.h
index 15e27bdb40cd2ff3afda92c42f3f053042b4dc2f..b3b7d5596c95da246a5f3067aeb8fd671509d1b5 100644
--- a/cpu/cc430/include/cc430-rtc.h
+++ b/cpu/cc430/include/cc430-rtc.h
@@ -4,14 +4,14 @@ Copyright 2010, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of µkleos.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
@@ -38,7 +38,7 @@ and the mailinglist (subscription via web site)
  * @file    cc430-rtc.h
  * @brief   CC430 Real Time Clock
  *
- * @author  Freie Universität Berlin, Computer Systems & Telematics, µkleos
+ * @author  Freie Universität Berlin, Computer Systems & Telematics, RIOT
  * @version $Revision $
  */
 
diff --git a/cpu/lpc214x/include/cpu.h b/cpu/lpc214x/include/cpu.h
index e439e61fd1a7d791cb58575d101babef59f3a54f..0a8dcdad4799f8fc6bcb401407f53057dfcc8ae3 100644
--- a/cpu/lpc214x/include/cpu.h
+++ b/cpu/lpc214x/include/cpu.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/cpu.c b/cpu/lpc2387/cpu.c
index c68bb6d6b9acabee6b80a62ccebd4419a77f836b..07ed4856c68e91a006b9250bae23c96445262fac 100644
--- a/cpu/lpc2387/cpu.c
+++ b/cpu/lpc2387/cpu.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/gpioint/lpc2387-gpioint.c b/cpu/lpc2387/gpioint/lpc2387-gpioint.c
index 49417274547f8c27b3e671c3a465906e117ffefe..12cf07d27be4f4384796563ffb55a5b21941f4d6 100644
--- a/cpu/lpc2387/gpioint/lpc2387-gpioint.c
+++ b/cpu/lpc2387/gpioint/lpc2387-gpioint.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/include/cpu-conf.h b/cpu/lpc2387/include/cpu-conf.h
index 9e6a2dde94e49b10bf018d038ddfdbbe4243af68..fb4706efb4cfc8f9f86ee0a0583ab5dc56cc9617 100644
--- a/cpu/lpc2387/include/cpu-conf.h
+++ b/cpu/lpc2387/include/cpu-conf.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/include/cpu.h b/cpu/lpc2387/include/cpu.h
index 70e2bc7e3075b3207690d3c95aa95619ffb376d7..659ba8c84c1896e9d447e4475304027afd37bf2c 100644
--- a/cpu/lpc2387/include/cpu.h
+++ b/cpu/lpc2387/include/cpu.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/include/lpc2387-adc.h b/cpu/lpc2387/include/lpc2387-adc.h
index 9f832a5ae605600b12480a904048382ac224cf4a..a861638a13b2959875bb2fdba20d3a888bcada23 100644
--- a/cpu/lpc2387/include/lpc2387-adc.h
+++ b/cpu/lpc2387/include/lpc2387-adc.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/include/lpc2387-rtc.h b/cpu/lpc2387/include/lpc2387-rtc.h
index 080a330cfc28295ebe217d3f0d88fc61c5a31bc3..f37425949debc8f8f3cc4701198388351ba5184a 100644
--- a/cpu/lpc2387/include/lpc2387-rtc.h
+++ b/cpu/lpc2387/include/lpc2387-rtc.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/linkerscript.x b/cpu/lpc2387/linkerscript.x
index efa60aaa2995083efcfee249923792600da35642..79ca56a93bc42cef93c84801674135f1b1367c73 100644
--- a/cpu/lpc2387/linkerscript.x
+++ b/cpu/lpc2387/linkerscript.x
@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/lpc2387-adc.c b/cpu/lpc2387/lpc2387-adc.c
index f3348a3d185d12ea3365aebc4e5f3e1a54779e7d..5d75c3fd33885c6e10e816d9187c4cbda12f0f84 100644
--- a/cpu/lpc2387/lpc2387-adc.c
+++ b/cpu/lpc2387/lpc2387-adc.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/lpc2387-lpm.c b/cpu/lpc2387/lpc2387-lpm.c
index e14cd9a30ddbe7e08af570cd7c6e05ef9f9719aa..141a2ffe253da80bdcf3d17eda3f17b41080f2e4 100644
--- a/cpu/lpc2387/lpc2387-lpm.c
+++ b/cpu/lpc2387/lpc2387-lpm.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/lpc2387/rtc/lpc2387-rtc.c b/cpu/lpc2387/rtc/lpc2387-rtc.c
index 4642042a6b2c9164f5839119528b2363dd6978b3..5ff30bd2749432e50ef572163d9aa6c7642486b5 100644
--- a/cpu/lpc2387/rtc/lpc2387-rtc.c
+++ b/cpu/lpc2387/rtc/lpc2387-rtc.c
@@ -4,14 +4,14 @@ Copyright 2008-2010, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/msp430-common/cpu.c b/cpu/msp430-common/cpu.c
index a297ec08d43dbaa4b5bf7996b544be210fd07f66..c7288cb94a185bd15314f4b317dde3edb3b92104 100644
--- a/cpu/msp430-common/cpu.c
+++ b/cpu/msp430-common/cpu.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/msp430-common/hwtimer_cpu.c b/cpu/msp430-common/hwtimer_cpu.c
index 0427e32a3f1b0e73623282fa1ff6feafe3cfc6b6..41024ac3418a1e676a7418fa405afc9123a79898 100644
--- a/cpu/msp430-common/hwtimer_cpu.c
+++ b/cpu/msp430-common/hwtimer_cpu.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/msp430-common/include/cpu-conf.h b/cpu/msp430-common/include/cpu-conf.h
index a79e422f54f5c55b27790d0954582066f7e1b3c9..a7cca6aa22aac543a5037205c049812c650655b6 100644
--- a/cpu/msp430-common/include/cpu-conf.h
+++ b/cpu/msp430-common/include/cpu-conf.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/msp430-common/include/cpu.h b/cpu/msp430-common/include/cpu.h
index 99d49f11312051c6cc36f9e5d0c9aaab00fe8326..a3e0a1df8c854471898398456da7a2131b2e4e05 100644
--- a/cpu/msp430-common/include/cpu.h
+++ b/cpu/msp430-common/include/cpu.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/msp430-common/include/hwtimer_cpu.h b/cpu/msp430-common/include/hwtimer_cpu.h
index 315153921891ac1c397cb080762f6b42ed7abb6d..a60012b02ea791ea58008f724d0a0b27ced97698 100644
--- a/cpu/msp430-common/include/hwtimer_cpu.h
+++ b/cpu/msp430-common/include/hwtimer_cpu.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/cpu/msp430-common/startup.c b/cpu/msp430-common/startup.c
index 230a0fd8004437ae0e0eeaeb709a1f6f7b3d8955..bad3bb95ccc42a7dc6a6d321334111ce776987a0 100644
--- a/cpu/msp430-common/startup.c
+++ b/cpu/msp430-common/startup.c
@@ -9,7 +9,7 @@ __attribute__ ((constructor)) static void startup(void) {
 
     board_init();
 
-    puts("ukleos MSP430 hardware initialization complete.\n");
+    puts("RIOT MSP430 hardware initialization complete.\n");
 
     kernel_init();
 }
diff --git a/dist/tools/testsuite/generate_html.sh b/dist/tools/testsuite/generate_html.sh
index 2d4b475f74b326a1614b42836aac67a573de444f..8944bf8f5c3ffa904b579c0569407494532d7658 100755
--- a/dist/tools/testsuite/generate_html.sh
+++ b/dist/tools/testsuite/generate_html.sh
@@ -6,7 +6,7 @@ HTMLDIR=${TOOLROOT}/tools/testsuite/html
 
 test -f ~/.buildbot && . ~/.buildbot
 
-OUTFILE=${HTMLFILE:-${HOME}/firekernel.html}
+OUTFILE=${HTMLFILE:-${HOME}/riot.html}
 LOGDIR=${BUILDLOGS:-${HOME}/buildlogs}
 
 {
diff --git a/dist/tools/testsuite/svn_test_revision.sh b/dist/tools/testsuite/svn_test_revision.sh
deleted file mode 100755
index 239ab4b1997a3b8fcfa461f8589d54e19a0e9a34..0000000000000000000000000000000000000000
--- a/dist/tools/testsuite/svn_test_revision.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. ~/.buildbot
-
-REPO=${REPO:-https://svn.mi.fu-berlin.de/msb/FeuerWare/trunk}
-LOGDIR=${LOGDIR:-${HOME}/buildlogs}
-
-REVISION=${1:-HEAD}
-
-LOGBASE="`date +%F-%Hh-%Mm-%Ss`-r${REVISION}-test.log"
-
-LOGFILE="${LOGDIR}/${LOGBASE}"
-TMPDIR=`mktemp -d /dev/shm/svn_test_repo.XXXXXXXXXX`
-
-TOOLROOT=${TOOLROOT:-.}
-
-if [ ! -d ${TMPDIR} ]; then exit 1; fi
-
-touch ${LOGFILE}.lock
-
-{
-    echo "${0} runnning checkout/build/test cycle."
-    echo "Repo: ${REPO}"
-    echo "Revision: ${REVISION}" 
-    echo "Temporary directory: ${TMPDIR}..."
-    echo "Logfilename: ${LOGBASE}"
-
-    cd ${TMPDIR} &&
-
-    echo "Checking out..." &&
-    svn co -q -r ${REVISION} ${REPO} &&
-    echo "Done." &&
-
-    cd ${TMPDIR}/trunk/board/msba2/tools && make &&
-    cd ${TMPDIR}/trunk &&
-    bash ${TOOLROOT}/tools/testsuite/run_tests.sh
-
-    echo
-    echo "Test run completed."
-} 2>&1 | tee ${LOGFILE}
-
-rm -f ${LOGFILE}.lock
-rm -f ${LOGFILE}.parsed
-
-rm -rf ${TMPDIR}
-
diff --git a/doc/doxygen/riot.doxyfile b/doc/doxygen/riot.doxyfile
index 490fd04f2120fafc623598a640dee19cc6860977..a46ed20a2b67e34bd48c72619bea5e3594acd1e6 100644
--- a/doc/doxygen/riot.doxyfile
+++ b/doc/doxygen/riot.doxyfile
@@ -4,7 +4,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = µkleos 
+PROJECT_NAME           = RIOT 
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = 
 CREATE_SUBDIRS         = NO
@@ -123,8 +123,8 @@ IGNORE_PREFIX          =
 GENERATE_HTML          = YES
 HTML_OUTPUT            = html
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = src/ukleos-header.html 
-HTML_FOOTER            = src/ukleos-footer.html
+HTML_HEADER            = src/riot-header.html 
+HTML_FOOTER            = src/riot-footer.html
 HTML_STYLESHEET        = 
 HTML_ALIGN_MEMBERS     = YES
 HTML_DYNAMIC_SECTIONS  = YES
diff --git a/doc/doxygen/src/ukleos-footer.html b/doc/doxygen/src/riot-footer.html
similarity index 100%
rename from doc/doxygen/src/ukleos-footer.html
rename to doc/doxygen/src/riot-footer.html
diff --git a/doc/doxygen/src/ukleos-header.html b/doc/doxygen/src/riot-header.html
similarity index 82%
rename from doc/doxygen/src/ukleos-header.html
rename to doc/doxygen/src/riot-header.html
index 0f98f639d4aec8cb745e035a9fd3c7bc98601b4e..f54fa45185cd2f011e5dcfe7a67e9266f922652b 100644
--- a/doc/doxygen/src/ukleos-header.html
+++ b/doc/doxygen/src/riot-header.html
@@ -4,7 +4,7 @@
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
         <meta name="date" content="$datetime">
         <title>$title</title>
-        <link href="ukleos.css" rel="stylesheet" type="text/css">
+        <link href="riot.css" rel="stylesheet" type="text/css">
         <link href="tabs.css" rel="stylesheet" type="text/css">
     </head>
     <body>
diff --git a/doc/doxygen/src/ukleos.css b/doc/doxygen/src/riot.css
similarity index 100%
rename from doc/doxygen/src/ukleos.css
rename to doc/doxygen/src/riot.css
diff --git a/drivers/cc110x/arch_cc1100.h b/drivers/cc110x/arch_cc1100.h
index 7c8b018a5079ee51025dcf7ec90de7a9b734471b..b49d4c2c42278c41180d9023b2be0b1bd599656a 100644
--- a/drivers/cc110x/arch_cc1100.h
+++ b/drivers/cc110x/arch_cc1100.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100-csmaca-mac.c b/drivers/cc110x/cc1100-csmaca-mac.c
index efa875631a02a7f53dd2e83d18ba8a94b84c7977..1861d49bdf743d321bc11c6adcc43609abcd999a 100644
--- a/drivers/cc110x/cc1100-csmaca-mac.c
+++ b/drivers/cc110x/cc1100-csmaca-mac.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100-csmaca-mac.h b/drivers/cc110x/cc1100-csmaca-mac.h
index ecfeedc39d4c805b91aeaca01760daea2006217d..203383f0729743ce016f9901b98a5182b35e4478 100644
--- a/drivers/cc110x/cc1100-csmaca-mac.h
+++ b/drivers/cc110x/cc1100-csmaca-mac.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100-defaultSettings.c b/drivers/cc110x/cc1100-defaultSettings.c
index e4561ff5897822e34eb0baf1f3001e5725484a05..2144a4dd70180ee280b39d7b3f61dad7aad84144 100644
--- a/drivers/cc110x/cc1100-defaultSettings.c
+++ b/drivers/cc110x/cc1100-defaultSettings.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100-defaultSettings.h b/drivers/cc110x/cc1100-defaultSettings.h
index a43ebe42cf79094b5320a9eb09ef5227b552499b..abc084ee69c214aa5aa734fa31b51ac99c8df20c 100644
--- a/drivers/cc110x/cc1100-defaultSettings.h
+++ b/drivers/cc110x/cc1100-defaultSettings.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100-interface.h b/drivers/cc110x/cc1100-interface.h
index ff9a0f2d5e879b86d9b6932ec5626432b259d399..b0787cafcd6b15d335093652f828be36fbd82500 100644
--- a/drivers/cc110x/cc1100-interface.h
+++ b/drivers/cc110x/cc1100-interface.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100-internal.h b/drivers/cc110x/cc1100-internal.h
index 54ddabde70386ca51a6eb40c7c2f1a143aec84e4..729db445b31ce513fac538911b03e8ec7c81f03e 100644
--- a/drivers/cc110x/cc1100-internal.h
+++ b/drivers/cc110x/cc1100-internal.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100.c b/drivers/cc110x/cc1100.c
index 49e73d27b7fb4350c16b3d104887d3c74cc5f09c..0bf9fd50162c977a46a93c4d75d27fe95686686a 100644
--- a/drivers/cc110x/cc1100.c
+++ b/drivers/cc110x/cc1100.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100.h b/drivers/cc110x/cc1100.h
index 2143e853a6003ca7200c36b3aea88ed6a3f3e970..c4eb8bff84c2a817de3b3f36ae51bb4f010c5130 100644
--- a/drivers/cc110x/cc1100.h
+++ b/drivers/cc110x/cc1100.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100_phy.c b/drivers/cc110x/cc1100_phy.c
index 8241605806701005884610fa799002e2b8ea1517..2dea1cd782ecf1d20431bf7d938a44e52c090871 100644
--- a/drivers/cc110x/cc1100_phy.c
+++ b/drivers/cc110x/cc1100_phy.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100_phy.h b/drivers/cc110x/cc1100_phy.h
index eb4c3530ff30a25601d9ef3e181d806b68ab2ee1..2e5629e8b0b58964ed8bc91b216872b41f218bfc 100644
--- a/drivers/cc110x/cc1100_phy.h
+++ b/drivers/cc110x/cc1100_phy.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100_spi.c b/drivers/cc110x/cc1100_spi.c
index 2614caf20ab4e447c19f3f4ba25be85f4ef2effe..d3077f7b677f1b4dc61d4607cc452f17b91e8739 100644
--- a/drivers/cc110x/cc1100_spi.c
+++ b/drivers/cc110x/cc1100_spi.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x/cc1100_spi.h b/drivers/cc110x/cc1100_spi.h
index e76deb8b27ae57b6c0be55c07fff0e5cc4809a6e..b26740f486cb6c9f1424b71c6c63504a1576c238 100644
--- a/drivers/cc110x/cc1100_spi.h
+++ b/drivers/cc110x/cc1100_spi.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x_ng/cc110x-defaultSettings.c b/drivers/cc110x_ng/cc110x-defaultSettings.c
index dc15fbd2329d14d29e5122a83400411557794837..621eb8ea368f6bfccbb0bfd370505140cfde8b17 100644
--- a/drivers/cc110x_ng/cc110x-defaultSettings.c
+++ b/drivers/cc110x_ng/cc110x-defaultSettings.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x_ng/include/cc110x-arch.h b/drivers/cc110x_ng/include/cc110x-arch.h
index 3a990b1ba5995ffcd9f9f1092715c3bc532f235e..e24377c923cd768075b2418858bc1be3428163e2 100644
--- a/drivers/cc110x_ng/include/cc110x-arch.h
+++ b/drivers/cc110x_ng/include/cc110x-arch.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x_ng/include/cc110x-defaultSettings.h b/drivers/cc110x_ng/include/cc110x-defaultSettings.h
index d15a45cd55ef41aea14c809395ac6d7e960dd846..be7fff764a1bc529658f55c9cbae0cc3782bdda9 100644
--- a/drivers/cc110x_ng/include/cc110x-defaultSettings.h
+++ b/drivers/cc110x_ng/include/cc110x-defaultSettings.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x_ng/include/cc110x-internal.h b/drivers/cc110x_ng/include/cc110x-internal.h
index 409c3b9885fa1a7fa0812f93d6c0a24304f1f49e..6d658facf51af71c79a3546005ca0f95a4a4c541 100644
--- a/drivers/cc110x_ng/include/cc110x-internal.h
+++ b/drivers/cc110x_ng/include/cc110x-internal.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x_ng/include/cc110x-reg.h b/drivers/cc110x_ng/include/cc110x-reg.h
index 02756ca5f634e84873e0cabdcfabe79203c2acc0..49943585f39b8f9c6f93bc02177c1c3f960757aa 100644
--- a/drivers/cc110x_ng/include/cc110x-reg.h
+++ b/drivers/cc110x_ng/include/cc110x-reg.h
@@ -3,7 +3,7 @@
  * @ingroup dev_cc110x_ng
  * @brief   Access to CC110X registers
  *
- * @author  Freie Uniersität Berlin, Computer Systems & Telematics, µkleos
+ * @author  Freie Uniersität Berlin, Computer Systems & Telematics, RIOT
  * @author  Oliver Hahm <oliver.hahm@fu-berlin.de
  * version  $Revision$
  *
diff --git a/drivers/cc110x_ng/include/cc110x_spi.h b/drivers/cc110x_ng/include/cc110x_spi.h
index 274f544124041e8c411e29f56ec895702af906a4..e357abdf28cdf5f087f47bcd8e70779a8c2e66f6 100644
--- a/drivers/cc110x_ng/include/cc110x_spi.h
+++ b/drivers/cc110x_ng/include/cc110x_spi.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/cc110x_ng/spi/cc110x_spi.c b/drivers/cc110x_ng/spi/cc110x_spi.c
index cd573038627d9ac1931a113675c5a85cd6492bc3..c8621002b5ae3c2633b0d53591b9d43a5c0168f1 100644
--- a/drivers/cc110x_ng/spi/cc110x_spi.c
+++ b/drivers/cc110x_ng/spi/cc110x_spi.c
@@ -4,14 +4,14 @@ Copyright 2010, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of µkleos.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/include/gpioint.h b/drivers/include/gpioint.h
index 8d5d30f1e4456322a2ba597142ae700059587539..2c77de067d8dacfc8f3c775c67c5e20e64baf5c2 100644
--- a/drivers/include/gpioint.h
+++ b/drivers/include/gpioint.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universität Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/include/ltc4150_arch.h b/drivers/include/ltc4150_arch.h
index 51c76ca5943fbbca62e21ab974b555f70ba0a3ce..508d10c6d97c0e671234df1add61f8e66bde658e 100644
--- a/drivers/include/ltc4150_arch.h
+++ b/drivers/include/ltc4150_arch.h
@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/include/rtc.h b/drivers/include/rtc.h
index b40b72b5037f80ebfe7c742150b4ca750597eea4..25b0d8759b04a028745ddb39b8dcdf665fc922d5 100644
--- a/drivers/include/rtc.h
+++ b/drivers/include/rtc.h
@@ -4,14 +4,14 @@ Copyright 2010, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of µkleos.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/include/sht11.h b/drivers/include/sht11.h
index 227569f5e1cdbe4085806afaf60ddfb1880b8bc1..a72a4518ca789d5fde46ec6593ddd42aeb4ce784 100644
--- a/drivers/include/sht11.h
+++ b/drivers/include/sht11.h
@@ -9,7 +9,7 @@ the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/ltc4150/ltc4150.c b/drivers/ltc4150/ltc4150.c
index 70c4a4ac11d075c0e2481f4539ad2fac31b30f5a..5a303b3fcff20d8dd653553b50d0c2d72aa63587 100644
--- a/drivers/ltc4150/ltc4150.c
+++ b/drivers/ltc4150/ltc4150.c
@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/drivers/sht11/sht11.c b/drivers/sht11/sht11.c
index c81cfc56b137df7751615a6a7619969463e15a6e..872888a06728cb18a1ea149b6ff134364dd4fbf5 100644
--- a/drivers/sht11/sht11.c
+++ b/drivers/sht11/sht11.c
@@ -9,7 +9,7 @@ the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/include/radio/radio.h b/sys/include/radio/radio.h
index 747b9c86d019bb48da963a0768e0e29a2f807228..1cab03ee90f2fb37590685aad12f5ad50c5ce6b3 100644
--- a/sys/include/radio/radio.h
+++ b/sys/include/radio/radio.h
@@ -4,14 +4,14 @@ Copyright 2008-2009 , Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/include/radio/types.h b/sys/include/radio/types.h
index c84a12e0972032946c9c41e6cb3c9ef982bb9bb0..28cfa5b3c93690c57b8409471867020bfc5ea793 100644
--- a/sys/include/radio/types.h
+++ b/sys/include/radio/types.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/include/shell.h b/sys/include/shell.h
index d5ca165890c57778e5d9c8bc64508f70d051f73a..00f34148b186e7ebc72fb064bc942f6f9952bcba 100644
--- a/sys/include/shell.h
+++ b/sys/include/shell.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/logd/logd.c b/sys/logd/logd.c
index 2dcfa1196d93e38fd3e8898f343527cf61a8c37e..7f277162ce8b91abfcc7b8415775f10d36c548dc 100644
--- a/sys/logd/logd.c
+++ b/sys/logd/logd.c
@@ -4,14 +4,14 @@ Copyright 2009-2010, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/net/mm/mmr.c b/sys/net/mm/mmr.c
index a1bf646b521d8ab4832403e624dfff153af37b5b..7ac2f2e53f7d0acb9298278ba5aae99b23f4d49b 100644
--- a/sys/net/mm/mmr.c
+++ b/sys/net/mm/mmr.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/net/mm/mmr.h b/sys/net/mm/mmr.h
index faff3572c87eec311662fe615a22ec5da9364906..9be7e6145f6e7cd64c6f46b08cbb836db058a375 100644
--- a/sys/net/mm/mmr.h
+++ b/sys/net/mm/mmr.h
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/net/mm/mmstack.c b/sys/net/mm/mmstack.c
index 56fdb4d3d2b2f9f772c7002cdc398de34777cb2f..5d6b484b8c10f7d4bfd4052121c442be47612b37 100644
--- a/sys/net/mm/mmstack.c
+++ b/sys/net/mm/mmstack.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/net/mm/mmstack.h b/sys/net/mm/mmstack.h
index e07fa4f38f20746d034e0e5ebd57cd0efbf2e4b4..2b40fa8630934ac1d71f15ce3714732ecfc53c26 100644
--- a/sys/net/mm/mmstack.h
+++ b/sys/net/mm/mmstack.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/net/protocol-multiplex.c b/sys/net/protocol-multiplex.c
index 7f3857b4ef910e0854fa248058359f0496bb1fb9..a81dbc964c6e698c6be4e03f1fc44890b93a190f 100644
--- a/sys/net/protocol-multiplex.c
+++ b/sys/net/protocol-multiplex.c
@@ -4,14 +4,14 @@ Copyright 2009-2010, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/net/protocol-multiplex.h b/sys/net/protocol-multiplex.h
index d48bdefc1867ffaeac611ef700b227df76eb5c01..43784c152a1d7e8c11fce992d6237e980c1ff148 100644
--- a/sys/net/protocol-multiplex.h
+++ b/sys/net/protocol-multiplex.h
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/shell/shell.c b/sys/shell/shell.c
index ffeaee350a348db53bd6b51d06bd96ebb236d009..3762bc820d52523dfcbc24ed4d23e73020ac40cc 100644
--- a/sys/shell/shell.c
+++ b/sys/shell/shell.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/syslog/syslog-api.c b/sys/syslog/syslog-api.c
index 8b3c9a43f606f8b62e03456039b0b9f04905a452..8e157e5480403e0f752a7ddb4f188a61828d8576 100644
--- a/sys/syslog/syslog-api.c
+++ b/sys/syslog/syslog-api.c
@@ -4,14 +4,14 @@ Copyright 2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/syslog/syslog-out.c b/sys/syslog/syslog-out.c
index 6253425c73a5fe6e308db4b825248438e0c621dc..2a5fa75550718b2351bc957992cc265f251b1df3 100644
--- a/sys/syslog/syslog-out.c
+++ b/sys/syslog/syslog-out.c
@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/syslog/syslog.c b/sys/syslog/syslog.c
index 31ed0a0cbb2c508b494d3a3df373ae70532c1a91..8283f60df55c8ac982becbbde46d2940d83ec016 100644
--- a/sys/syslog/syslog.c
+++ b/sys/syslog/syslog.c
@@ -4,14 +4,14 @@ Copyright 2008-2009, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/sys/tracelog/tracelog.c b/sys/tracelog/tracelog.c
index a1f88afe361027eee7866d04ffbf261492b85180..7249e85138de44d1af16574a47f2073174137a19 100644
--- a/sys/tracelog/tracelog.c
+++ b/sys/tracelog/tracelog.c
@@ -4,14 +4,14 @@ Copyright 2008, Freie Universitaet Berlin (FUB). All rights reserved.
 These sources were developed at the Freie Universitaet Berlin, Computer Systems
 and Telematics group (http://cst.mi.fu-berlin.de).
 -------------------------------------------------------------------------------
-This file is part of FeuerWare.
+This file is part of RIOT.
 
 This program is free software: you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software
 Foundation, either version 3 of the License, or (at your option) any later
 version.
 
-FeuerWare is distributed in the hope that it will be useful, but WITHOUT
+RIOT is distributed in the hope that it will be useful, but WITHOUT
 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
diff --git a/testsuite/build_and_generate_html.sh b/testsuite/build_and_generate_html.sh
deleted file mode 100755
index 335cd58de4d8a6b5920af734b6ca8e4aec3a3327..0000000000000000000000000000000000000000
--- a/testsuite/build_and_generate_html.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-test -f ~/.buildbot && . ~/.buildbot
-
-export REVISION=${1}
-export ROOT=${ROOT:-.}
-
-${ROOT}/testsuite/svn_test_revision.sh ${REVISION}
-${ROOT}/testsuite/generate_html.sh
-
diff --git a/testsuite/generate_html.sh b/testsuite/generate_html.sh
deleted file mode 100755
index 2d4b475f74b326a1614b42836aac67a573de444f..0000000000000000000000000000000000000000
--- a/testsuite/generate_html.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-ROOT=${ROOT:-.}
-TOOLROOT=${TOOLROOT:-${ROOT}}
-HTMLDIR=${TOOLROOT}/tools/testsuite/html
-
-test -f ~/.buildbot && . ~/.buildbot
-
-OUTFILE=${HTMLFILE:-${HOME}/firekernel.html}
-LOGDIR=${BUILDLOGS:-${HOME}/buildlogs}
-
-{
-cat ${HTMLDIR}/header 
-
-for i in `ls -t $LOGDIR/*.log`; do
-    ${TOOLROOT}/tools/testsuite/parse_buildlog.sh $i
-    if [ "x${HTTPROOT}x"!="xx" ]; then
-        echo "<br>"
-        echo "Full build log: <a href=\"${HTTPROOT}/`basename ${i}`\"> click here </a>."
-    fi
-
-done
-
-cat ${HTMLDIR}/footer 
-} > ${OUTFILE}
-
-
diff --git a/testsuite/html/footer b/testsuite/html/footer
deleted file mode 100644
index a446d53d9d16320fab607b7916e5c567663026b7..0000000000000000000000000000000000000000
--- a/testsuite/html/footer
+++ /dev/null
@@ -1 +0,0 @@
-</body>
diff --git a/testsuite/html/header b/testsuite/html/header
deleted file mode 100644
index 4d9384a397063b9811b2c835d8485e31b1d70233..0000000000000000000000000000000000000000
--- a/testsuite/html/header
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<header>
-<title> Feuerwhere Build Bot results </title>
-</header>
-<body>
-
diff --git a/testsuite/parse_buildlog.sh b/testsuite/parse_buildlog.sh
deleted file mode 100755
index 3ce5bf53cab99634749b1c62ce504c936ee699b1..0000000000000000000000000000000000000000
--- a/testsuite/parse_buildlog.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-LOG=${1}
-
-if [ "xx${PARSELOG_ALWAYS}xx"=!"xxyxx" ]; then
-    if [ -f ${LOG}.parsed ]; then
-        cat ${LOG}.parsed
-        exit 0
-    fi
-fi
-
-{
-#BUILD_FAIL=`grep '\[BUILD FAILED\]' ${LOG} | wc -l`
-NUM_FAIL=`grep '\[.* FAILED\]' ${LOG} | wc -l`
-NUM_OK=`grep '\[TEST SUCCESSFUL\]' ${LOG} | wc -l`
-
-REVISION=`awk '/^Revision:/ { print $2; exit}' $LOG`
-REPO=`awk '/^Repo:/ { print $2; exit}' $LOG`
-
-
-if [ -f ${LOG}.lock ]; then
-    BUILD_STATUS="build in progress..."
-elif (($NUM_FAIL==0)); then
-    BUILD_STATUS="OK"
-else
-    BUILD_STATUS="broken!"
-fi
-    
-echo "<h2>Revision: ${REVISION} Status: ${BUILD_STATUS}</h2>"
-
-svn log --incremental -v -l 1 ${REPO}@${REVISION} | sed -e 's/$/<br>/'
-
-echo "------------------------------------------------------------------------<br>"
-
-if (($NUM_FAIL==0)); then
-    true
-else
-echo "<br> Failed builds/tests: <br>"
-    grep '\[.* FAILED\]' ${LOG} | uniq | sed -e 's/$/<br>/'
-fi
-} | tee ${1}.parsed
-
-
diff --git a/testsuite/run_tests.sh b/testsuite/run_tests.sh
deleted file mode 100755
index 1344e604a38127546e46f114be7b82c8561dac61..0000000000000000000000000000000000000000
--- a/testsuite/run_tests.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-TOOLROOT=${TOOLROOT:-.}
-
-flash() {
-    echo "Building ${1}..."
-    jam -aq flash || ( echo "[BUILD FAILED] ${1}" && false ) 
-}
-
-run_tests() {
-    TESTDIR=projects/${1}/tests
-    flash ${PROJECT} || return
-    for tst in `ls ${TESTDIR}/`; do 
-        echo "Project \"${1}\": Running test ${tst}..."
-        $TESTDIR/$tst || (
-            echo
-            echo "[TEST FAILED] ${TESTDIR}/${tst}"
-            ) || echo "[TEST SUCCESSFUL] ${TESTDIR}/${tst}"
-    done
-}
-
-echo 
-echo "Running tests..."
-echo
-
-for i in projects/*; do
-    export PROJECT=`basename $i`
-    if [ -d projects/${PROJECT}/tests ]; then
-        {
-            echo "Testing project ${PROJECT}..."
-            PORT="`sh ${TOOLROOT}/tools/lock_board.sh`"
-            FLASHUTIL_SHELL="sh -c"
-
-            echo "Using Target connecting to ${PORT}."
-
-            export PORT FLASHUTIL_SHELL
-            run_tests ${PROJECT}
-
-            sh ${TOOLROOT}/tools/unlock_board.sh ${PORT}
-        } 2>&1
-    fi
-done
-
diff --git a/testsuite/svn_test_revision.sh b/testsuite/svn_test_revision.sh
deleted file mode 100755
index 239ab4b1997a3b8fcfa461f8589d54e19a0e9a34..0000000000000000000000000000000000000000
--- a/testsuite/svn_test_revision.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. ~/.buildbot
-
-REPO=${REPO:-https://svn.mi.fu-berlin.de/msb/FeuerWare/trunk}
-LOGDIR=${LOGDIR:-${HOME}/buildlogs}
-
-REVISION=${1:-HEAD}
-
-LOGBASE="`date +%F-%Hh-%Mm-%Ss`-r${REVISION}-test.log"
-
-LOGFILE="${LOGDIR}/${LOGBASE}"
-TMPDIR=`mktemp -d /dev/shm/svn_test_repo.XXXXXXXXXX`
-
-TOOLROOT=${TOOLROOT:-.}
-
-if [ ! -d ${TMPDIR} ]; then exit 1; fi
-
-touch ${LOGFILE}.lock
-
-{
-    echo "${0} runnning checkout/build/test cycle."
-    echo "Repo: ${REPO}"
-    echo "Revision: ${REVISION}" 
-    echo "Temporary directory: ${TMPDIR}..."
-    echo "Logfilename: ${LOGBASE}"
-
-    cd ${TMPDIR} &&
-
-    echo "Checking out..." &&
-    svn co -q -r ${REVISION} ${REPO} &&
-    echo "Done." &&
-
-    cd ${TMPDIR}/trunk/board/msba2/tools && make &&
-    cd ${TMPDIR}/trunk &&
-    bash ${TOOLROOT}/tools/testsuite/run_tests.sh
-
-    echo
-    echo "Test run completed."
-} 2>&1 | tee ${LOGFILE}
-
-rm -f ${LOGFILE}.lock
-rm -f ${LOGFILE}.parsed
-
-rm -rf ${TMPDIR}
-