diff --git a/core/include/atomic.h b/core/include/atomic.h
index c24981f9f1905f03f2d732a214bf1252c658fc64..8733e5037ec0ba195696ec41874790d9c8d0cc38 100644
--- a/core/include/atomic.h
+++ b/core/include/atomic.h
@@ -9,7 +9,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 
diff --git a/core/include/bitarithm.h b/core/include/bitarithm.h
index d159f33348ba3182c052a11d44e894ec78170667..022e09b396aa183893e19e96e545b1c054708389 100644
--- a/core/include/bitarithm.h
+++ b/core/include/bitarithm.h
@@ -10,7 +10,7 @@
  * @ingroup	lib
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 
diff --git a/core/include/clist.h b/core/include/clist.h
index 2dac25f09b30b784f4e9da2748e632c420060d01..5df80db5bc47be06067ae7b0682162a735bea758 100644
--- a/core/include/clist.h
+++ b/core/include/clist.h
@@ -11,7 +11,7 @@
  * @ingroup	lib
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 
diff --git a/core/include/debug.h b/core/include/debug.h
index d680fd5aa74252f7df892518ecd1d23fcb919b12..649171de72662ad61578506b0c800d891df057b4 100644
--- a/core/include/debug.h
+++ b/core/include/debug.h
@@ -11,7 +11,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  * @}
  */
diff --git a/core/include/hwtimer.h b/core/include/hwtimer.h
index 7a2ce835d87277315c5507b536259ee4c25556d4..9dcd3fc5ebb0b69869c095414dea49b81d42202c 100644
--- a/core/include/hwtimer.h
+++ b/core/include/hwtimer.h
@@ -15,7 +15,7 @@
  * @{
  * @file
  *
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Heiko Will
  * @author Kaspar Schleiser <kaspar@schleiser.de>
  * @author Michael Baar
diff --git a/core/include/hwtimer_arch.h b/core/include/hwtimer_arch.h
index 23fa96b890743f363c9ed21ff73e17348bccd465..2c872521e6667e8c51b67577db0027381d0d73a5 100644
--- a/core/include/hwtimer_arch.h
+++ b/core/include/hwtimer_arch.h
@@ -9,7 +9,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author Heiko Will <hwill@inf.fu-berlin.de>
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
diff --git a/core/include/kernel.h b/core/include/kernel.h
index 49dda3664b248dda0457a2d8fddfac74d256f2f8..17bad798789c2ed4e52b8122220df4a917e8ff4a 100644
--- a/core/include/kernel.h
+++ b/core/include/kernel.h
@@ -9,7 +9,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author Freie Universität Berlin, Computer Systems & Telematics
  * @author Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
 
diff --git a/core/include/kernel_intern.h b/core/include/kernel_intern.h
index ca50b55e366e853722289f38a1c9fb6907e679d5..4eb1a9e9b651ddbaa54271363f1e43a169a31601 100644
--- a/core/include/kernel_intern.h
+++ b/core/include/kernel_intern.h
@@ -2,7 +2,7 @@
  * @ingroup	kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/lpm.h b/core/include/lpm.h
index 95b2d7b5be06ec4c2ef3abfcb13914229cfe5cd6..a10ded35466a7b7cc34af5f31d6d4f2aaebf17a9 100644
--- a/core/include/lpm.h
+++ b/core/include/lpm.h
@@ -11,7 +11,7 @@
  * @file
  * @brief       Power Management Interface
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @version     $Revision$
  *
  * This interface needs to be implemented for each platform.
diff --git a/core/include/msg.h b/core/include/msg.h
index 8a58bb26a953903ef4d0e0d58f406fb369537b65..d907ccf99d07413302c2a8365cd15f4c9d13c4a9 100644
--- a/core/include/msg.h
+++ b/core/include/msg.h
@@ -14,7 +14,7 @@
 
 /**
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/mutex.h b/core/include/mutex.h
index 5140881ee441b35f837e031f8bf07460c3f41bd4..3613e91a4a8e6a54d4ef6800519added8155a91a 100644
--- a/core/include/mutex.h
+++ b/core/include/mutex.h
@@ -6,7 +6,7 @@
 
 /**
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/oneway_malloc.h b/core/include/oneway_malloc.h
index 56daf2cc808ccfab9b47360a6d94a7cf96f8825c..d030dd6759ed19eb5ea7f1efbba16cd346af5b03 100644
--- a/core/include/oneway_malloc.h
+++ b/core/include/oneway_malloc.h
@@ -2,7 +2,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/queue.h b/core/include/queue.h
index ae377409ded7341cee866f3f62e2a24209e6878e..2e3cab39f8bcf814a73e30799c592388bc132b0b 100644
--- a/core/include/queue.h
+++ b/core/include/queue.h
@@ -2,7 +2,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/sched.h b/core/include/sched.h
index 5f3c3ce15c23600358b37f039b5286e795ea2780..108914d5a92d2b04d9a3020b6860e7d9b271d6e8 100644
--- a/core/include/sched.h
+++ b/core/include/sched.h
@@ -2,7 +2,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/tcb.h b/core/include/tcb.h
index 9d6f5f26cf24d978db3cd9cd5bc14f8b19890d99..729837d5944477de032856027186fd1332e21fe0 100644
--- a/core/include/tcb.h
+++ b/core/include/tcb.h
@@ -2,7 +2,7 @@
  * @ingroup kernel
  * @{
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/core/include/thread.h b/core/include/thread.h
index 31fb4e80a6ad5a32e06d4d8edd00b4248c66a450..f4cb0bad5e1e5463ff32c1db1da54160ba7f745f 100644
--- a/core/include/thread.h
+++ b/core/include/thread.h
@@ -9,7 +9,7 @@
 
 /**
  * @file
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/cpu/arm_common/bootloader.c b/cpu/arm_common/bootloader.c
index ae3b72b57cddb6af975651885dc35a0c67ff5d4c..56bfc39958ed8909a25ddd09261b37177352108c 100644
--- a/cpu/arm_common/bootloader.c
+++ b/cpu/arm_common/bootloader.c
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief       ARM bootloader
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  * @author      Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision$
diff --git a/cpu/arm_common/hwtimer_cpu.c b/cpu/arm_common/hwtimer_cpu.c
index a959429c8bbe26a6ee00bd3c8d6ed586a7fde935..beadde7607133e8cdab940a405906ea17c0117e6 100644
--- a/cpu/arm_common/hwtimer_cpu.c
+++ b/cpu/arm_common/hwtimer_cpu.c
@@ -4,7 +4,7 @@
  * @internal
  * @brief       ARM kernel timer CPU dependent functions implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author      Heiko Will <hwill@inf.fu-berlin.de>
  *
diff --git a/cpu/arm_common/include/arm_common.h b/cpu/arm_common/include/arm_common.h
index 0e40e7e632264dd644ff770a2f18908d465ea5c1..2fdc7d200ec489d751a14a795dec5776914385cc 100644
--- a/cpu/arm_common/include/arm_common.h
+++ b/cpu/arm_common/include/arm_common.h
@@ -37,7 +37,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		ARM CPU common declarations
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @version     $Revision$
  *
  * @note		$Id$
diff --git a/cpu/arm_common/syscalls.c b/cpu/arm_common/syscalls.c
index fa79909da4b327a8cbeb1d5be87aa975500c872f..b9103ff59218351d8ad69b829f305c5c3c0ab45b 100644
--- a/cpu/arm_common/syscalls.c
+++ b/cpu/arm_common/syscalls.c
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		lpc2387
  * @brief		LPC2387 NewLib system calls implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision$
  *
diff --git a/cpu/lpc2387/gpioint/lpc2387-gpioint.c b/cpu/lpc2387/gpioint/lpc2387-gpioint.c
index 12cf07d27be4f4384796563ffb55a5b21941f4d6..30706da9d400c34173eaee74d4806eea2df86543 100644
--- a/cpu/lpc2387/gpioint/lpc2387-gpioint.c
+++ b/cpu/lpc2387/gpioint/lpc2387-gpioint.c
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		LPC2387 GPIO Interrupt Multiplexer implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision: 1508 $
  *
diff --git a/cpu/lpc2387/include/cpu-conf.h b/cpu/lpc2387/include/cpu-conf.h
index fb4706efb4cfc8f9f86ee0a0583ab5dc56cc9617..5f7c2860b45a3ba76fc618b14e9d633414c12b1d 100644
--- a/cpu/lpc2387/include/cpu-conf.h
+++ b/cpu/lpc2387/include/cpu-conf.h
@@ -38,7 +38,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		LPC2387 CPUconfiguration
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		baar
  * @version     $Revision$
  *
diff --git a/cpu/lpc2387/include/lpc2387-adc.h b/cpu/lpc2387/include/lpc2387-adc.h
index a861638a13b2959875bb2fdba20d3a888bcada23..b273c27ce86127ef222dfbea295e4015f07f1335 100644
--- a/cpu/lpc2387/include/lpc2387-adc.h
+++ b/cpu/lpc2387/include/lpc2387-adc.h
@@ -38,7 +38,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		LPC2387 ADC
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3249 $
  *
diff --git a/cpu/lpc2387/include/lpc2387-rtc.h b/cpu/lpc2387/include/lpc2387-rtc.h
index f37425949debc8f8f3cc4701198388351ba5184a..600554cc02eb661602195ccfb188ac384a579949 100644
--- a/cpu/lpc2387/include/lpc2387-rtc.h
+++ b/cpu/lpc2387/include/lpc2387-rtc.h
@@ -42,7 +42,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		LPC2387 Real-Time-Clock
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @version     $Revision: 1998 $
  *
  * @note    	$Id: lpc2387-rtc.h 1998 2010-03-16 13:05:41Z baar $
diff --git a/cpu/lpc2387/lpc2387-adc.c b/cpu/lpc2387/lpc2387-adc.c
index 5d75c3fd33885c6e10e816d9187c4cbda12f0f84..274876fbe4e40e99a4c603a2e6761eabbcfd43a5 100644
--- a/cpu/lpc2387/lpc2387-adc.c
+++ b/cpu/lpc2387/lpc2387-adc.c
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		lpc2387_adc
  * @brief		LPC2387 ADC
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3250 $
  *
diff --git a/cpu/lpc2387/lpc2387-lpm.c b/cpu/lpc2387/lpc2387-lpm.c
index 141a2ffe253da80bdcf3d17eda3f17b41080f2e4..8261873d405443daee93ef208f466dd04ddf4de0 100644
--- a/cpu/lpc2387/lpc2387-lpm.c
+++ b/cpu/lpc2387/lpc2387-lpm.c
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @brief		LPC2387 Low-Power management
  * @ingroup		lpc2387
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author 		Heiko Will
  * @version     $Revision$
  *
diff --git a/cpu/lpc2387/rtc/lpc2387-rtc.c b/cpu/lpc2387/rtc/lpc2387-rtc.c
index 5ff30bd2749432e50ef572163d9aa6c7642486b5..0364fb77935be0e8520a7674b639e778c0cfda82 100644
--- a/cpu/lpc2387/rtc/lpc2387-rtc.c
+++ b/cpu/lpc2387/rtc/lpc2387-rtc.c
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		lpc2387_rtc
  * @brief		LPC2387 Real-Time-Clock
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision: 2005 $
  *
diff --git a/drivers/cc110x/arch_cc1100.h b/drivers/cc110x/arch_cc1100.h
index b49d4c2c42278c41180d9023b2be0b1bd599656a..7d42ed3279e006654261fac3223376014869206b 100644
--- a/drivers/cc110x/arch_cc1100.h
+++ b/drivers/cc110x/arch_cc1100.h
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		LPC2387
  * @brief		CC1100 LPC2387 dependend functions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
  *
diff --git a/drivers/cc110x/cc1100-csmaca-mac.c b/drivers/cc110x/cc1100-csmaca-mac.c
index 1861d49bdf743d321bc11c6adcc43609abcd999a..2eaa401b94a16849397ccb4111ea602fa561cc95 100644
--- a/drivers/cc110x/cc1100-csmaca-mac.c
+++ b/drivers/cc110x/cc1100-csmaca-mac.c
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		dev_cc110x
  * @brief		ScatterWeb MSB-A2 mac-layer
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2128 $
diff --git a/drivers/cc110x/cc1100-csmaca-mac.h b/drivers/cc110x/cc1100-csmaca-mac.h
index 203383f0729743ce016f9901b98a5182b35e4478..5d0e2b2f2a073bcb37b67fe50b1d3016294d9ae9 100644
--- a/drivers/cc110x/cc1100-csmaca-mac.h
+++ b/drivers/cc110x/cc1100-csmaca-mac.h
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		dev_cc110x
  * @brief		ScatterWeb MSB-A2 mac-layer
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1999 $
diff --git a/drivers/cc110x/cc1100-defaultSettings.c b/drivers/cc110x/cc1100-defaultSettings.c
index 2144a4dd70180ee280b39d7b3f61dad7aad84144..008e9d9393fc29dc5c1b6b52f41221097248e75a 100644
--- a/drivers/cc110x/cc1100-defaultSettings.c
+++ b/drivers/cc110x/cc1100-defaultSettings.c
@@ -33,7 +33,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		TI Chipcon CC110x default settings
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2058 $
diff --git a/drivers/cc110x/cc1100-defaultSettings.h b/drivers/cc110x/cc1100-defaultSettings.h
index abc084ee69c214aa5aa734fa31b51ac99c8df20c..2d8fa8408757df0baeb87fe94e6976cee1162d38 100644
--- a/drivers/cc110x/cc1100-defaultSettings.h
+++ b/drivers/cc110x/cc1100-defaultSettings.h
@@ -36,7 +36,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		TI Chipcon CC110x default settings
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2139 $
diff --git a/drivers/cc110x/cc1100-interface.h b/drivers/cc110x/cc1100-interface.h
index b0787cafcd6b15d335093652f828be36fbd82500..cc54f0cc5631d5a1c644dc01624a7198ef230257 100644
--- a/drivers/cc110x/cc1100-interface.h
+++ b/drivers/cc110x/cc1100-interface.h
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		TI Chipcon CC110x public interface
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 2283 $
  *
diff --git a/drivers/cc110x/cc1100-internal.h b/drivers/cc110x/cc1100-internal.h
index 729db445b31ce513fac538911b03e8ec7c81f03e..6f9e13acfe2de3fc2268bffcc18f3e4ebde24b5a 100644
--- a/drivers/cc110x/cc1100-internal.h
+++ b/drivers/cc110x/cc1100-internal.h
@@ -37,7 +37,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC110x internal hardware constants
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1231 $
diff --git a/drivers/cc110x/cc1100.c b/drivers/cc110x/cc1100.c
index 0bf9fd50162c977a46a93c4d75d27fe95686686a..987b3568b0ed0fc2ab1149f82d1217c55dd8e313 100644
--- a/drivers/cc110x/cc1100.c
+++ b/drivers/cc110x/cc1100.c
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC110x Radio driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2283 $
diff --git a/drivers/cc110x/cc1100.h b/drivers/cc110x/cc1100.h
index c4eb8bff84c2a817de3b3f36ae51bb4f010c5130..6eefb5d1ec27e007bc658f9f5730e998cab1835d 100644
--- a/drivers/cc110x/cc1100.h
+++ b/drivers/cc110x/cc1100.h
@@ -39,7 +39,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		TI Chipcon CC110x radio driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2128 $
diff --git a/drivers/cc110x/cc1100_phy.c b/drivers/cc110x/cc1100_phy.c
index 2dea1cd782ecf1d20431bf7d938a44e52c090871..01c49e58697a3b3eb0b1c3d082dfdd7d6ed80f94 100644
--- a/drivers/cc110x/cc1100_phy.c
+++ b/drivers/cc110x/cc1100_phy.c
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC110x physical radio driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2130 $
diff --git a/drivers/cc110x/cc1100_phy.h b/drivers/cc110x/cc1100_phy.h
index 2e5629e8b0b58964ed8bc91b216872b41f218bfc..8459783add957221e8a91c21e2c3832af3da133e 100644
--- a/drivers/cc110x/cc1100_phy.h
+++ b/drivers/cc110x/cc1100_phy.h
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC110x physical radio driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1285 $
diff --git a/drivers/cc110x/cc1100_spi.c b/drivers/cc110x/cc1100_spi.c
index d3077f7b677f1b4dc61d4607cc452f17b91e8739..04aa21d29b63a28ded3f53a9c4197e00ee71461a 100644
--- a/drivers/cc110x/cc1100_spi.c
+++ b/drivers/cc110x/cc1100_spi.c
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC1100 SPI driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
diff --git a/drivers/cc110x/cc1100_spi.h b/drivers/cc110x/cc1100_spi.h
index b26740f486cb6c9f1424b71c6c63504a1576c238..c5c53c2e22eec83e5653c99eee951f443e7439d5 100644
--- a/drivers/cc110x/cc1100_spi.h
+++ b/drivers/cc110x/cc1100_spi.h
@@ -33,7 +33,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC1100 SPI driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
diff --git a/drivers/cc110x_ng/cc110x-defaultSettings.c b/drivers/cc110x_ng/cc110x-defaultSettings.c
index 621eb8ea368f6bfccbb0bfd370505140cfde8b17..844dcb575827a349f5d77673fddbeea3a896ece9 100644
--- a/drivers/cc110x_ng/cc110x-defaultSettings.c
+++ b/drivers/cc110x_ng/cc110x-defaultSettings.c
@@ -33,7 +33,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		TI Chipcon CC110x default settings
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2058 $
diff --git a/drivers/cc110x_ng/include/cc110x-arch.h b/drivers/cc110x_ng/include/cc110x-arch.h
index e24377c923cd768075b2418858bc1be3428163e2..fb05fef5d53db721bb3b7f990a29b09a2d0982b1 100644
--- a/drivers/cc110x_ng/include/cc110x-arch.h
+++ b/drivers/cc110x_ng/include/cc110x-arch.h
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		LPC2387
  * @brief		CC1100 LPC2387 dependend functions
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
  *
diff --git a/drivers/cc110x_ng/include/cc110x-defaultSettings.h b/drivers/cc110x_ng/include/cc110x-defaultSettings.h
index be7fff764a1bc529658f55c9cbae0cc3782bdda9..76eb00d441bb9d0f731dece6e14ccdde55eb2da6 100644
--- a/drivers/cc110x_ng/include/cc110x-defaultSettings.h
+++ b/drivers/cc110x_ng/include/cc110x-defaultSettings.h
@@ -36,7 +36,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		TI Chipcon CC110x default settings
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 2139 $
diff --git a/drivers/cc110x_ng/include/cc110x-internal.h b/drivers/cc110x_ng/include/cc110x-internal.h
index 6d658facf51af71c79a3546005ca0f95a4a4c541..77ff43fbce2e7a4d89227ae2db64c1fecbc7fa21 100644
--- a/drivers/cc110x_ng/include/cc110x-internal.h
+++ b/drivers/cc110x_ng/include/cc110x-internal.h
@@ -37,7 +37,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC110x internal hardware constants
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1231 $
diff --git a/drivers/cc110x_ng/include/cc110x_spi.h b/drivers/cc110x_ng/include/cc110x_spi.h
index e357abdf28cdf5f087f47bcd8e70779a8c2e66f6..51d8c0393bcbf6ffb436a662b4f3300da43899d1 100644
--- a/drivers/cc110x_ng/include/cc110x_spi.h
+++ b/drivers/cc110x_ng/include/cc110x_spi.h
@@ -33,7 +33,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC1100 SPI driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
diff --git a/drivers/cc110x_ng/spi/cc110x_spi.c b/drivers/cc110x_ng/spi/cc110x_spi.c
index c8621002b5ae3c2633b0d53591b9d43a5c0168f1..867f93111ff4388d57970b638003d85a21c26f08 100644
--- a/drivers/cc110x_ng/spi/cc110x_spi.c
+++ b/drivers/cc110x_ng/spi/cc110x_spi.c
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		TI Chipcon CC1100 SPI driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @version     $Revision: 1775 $
diff --git a/drivers/include/gpioint.h b/drivers/include/gpioint.h
index 2c77de067d8dacfc8f3c775c67c5e20e64baf5c2..8f4ecd260af9673c148634873b62060e17ea7562 100644
--- a/drivers/include/gpioint.h
+++ b/drivers/include/gpioint.h
@@ -50,7 +50,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		GPIO IRQ Multiplexer interface
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Michael Baar <michael.baar@fu-berlin.de>
  * @version     $Revision: 1508 $
  *
diff --git a/drivers/include/ltc4150_arch.h b/drivers/include/ltc4150_arch.h
index 508d10c6d97c0e671234df1add61f8e66bde658e..84a5c6810253f208611b473ceebad53cff2544c1 100644
--- a/drivers/include/ltc4150_arch.h
+++ b/drivers/include/ltc4150_arch.h
@@ -37,7 +37,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief       LTC4150 Coulomb Counter
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
  * @version     $Revision: 1203 $
  *
diff --git a/drivers/include/sht11.h b/drivers/include/sht11.h
index a72a4518ca789d5fde46ec6593ddd42aeb4ce784..00f00e0bd16478de15ea30785f98839a011e4f40 100644
--- a/drivers/include/sht11.h
+++ b/drivers/include/sht11.h
@@ -35,7 +35,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		SHT11 Device Driver
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @version     $Revision: 667 $
  *
  * @note		$Id: sht11.h 667 2009-02-19 15:06:38Z baar $
diff --git a/drivers/ltc4150/ltc4150.c b/drivers/ltc4150/ltc4150.c
index 5a303b3fcff20d8dd653553b50d0c2d72aa63587..2175c37b082ce0b17c3e5c2f2b6d57c313f01c98 100644
--- a/drivers/ltc4150/ltc4150.c
+++ b/drivers/ltc4150/ltc4150.c
@@ -33,7 +33,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief       LTC4150 Coulomb Counter
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author      Heiko Will
  * @author      Kaspar Schleiser <kaspar.schleiser@fu-berlin.de>
  */
diff --git a/sys/include/radio/radio.h b/sys/include/radio/radio.h
index 1cab03ee90f2fb37590685aad12f5ad50c5ce6b3..c45431ce594faf645ba678fdaa19efadc6c2189d 100644
--- a/sys/include/radio/radio.h
+++ b/sys/include/radio/radio.h
@@ -40,7 +40,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		baar
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 1961 $
diff --git a/sys/include/radio/types.h b/sys/include/radio/types.h
index 28cfa5b3c93690c57b8409471867020bfc5ea793..a0d6b4c27de4d2f0ca861f782c61d89bc97af440 100644
--- a/sys/include/radio/types.h
+++ b/sys/include/radio/types.h
@@ -31,7 +31,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		Common network stack types (of all layers).
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 2061 $
  *
diff --git a/sys/logd/logd.c b/sys/logd/logd.c
index 7f277162ce8b91abfcc7b8415775f10d36c548dc..2552e7a78d1cff82ab3cb3c4c099fb7f229abc73 100644
--- a/sys/logd/logd.c
+++ b/sys/logd/logd.c
@@ -28,7 +28,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		Simple logging demon implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
  *
diff --git a/sys/net/mm/mmr.c b/sys/net/mm/mmr.c
index 7ac2f2e53f7d0acb9298278ba5aae99b23f4d49b..1bf3ae2f9243e8b2289ef5432e1cd5dbd6f3688e 100644
--- a/sys/net/mm/mmr.c
+++ b/sys/net/mm/mmr.c
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		Micro Mesh Routing
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
  *
diff --git a/sys/net/mm/mmr.h b/sys/net/mm/mmr.h
index 9be7e6145f6e7cd64c6f46b08cbb836db058a375..e58d31edbdee354b0a3fdaf6169c7c51284c8e01 100644
--- a/sys/net/mm/mmr.h
+++ b/sys/net/mm/mmr.h
@@ -32,7 +32,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		Micro Mesh Routing
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
  *
diff --git a/sys/net/mm/mmstack.c b/sys/net/mm/mmstack.c
index 5d6b484b8c10f7d4bfd4052121c442be47612b37..83a41b44e759a526837ad1e8c67b6b2f846e9aec 100644
--- a/sys/net/mm/mmstack.c
+++ b/sys/net/mm/mmstack.c
@@ -45,7 +45,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author 		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
  *
diff --git a/sys/net/mm/mmstack.h b/sys/net/mm/mmstack.h
index 2b40fa8630934ac1d71f15ce3714732ecfc53c26..22ce8790e31797ce6196844e33f4656886e0fd81 100644
--- a/sys/net/mm/mmstack.h
+++ b/sys/net/mm/mmstack.h
@@ -38,7 +38,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author 		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
  *
diff --git a/sys/net/protocol-multiplex.c b/sys/net/protocol-multiplex.c
index a81dbc964c6e698c6be4e03f1fc44890b93a190f..d5ac1894fa61de4de98efc287a32e06b060842ea 100644
--- a/sys/net/protocol-multiplex.c
+++ b/sys/net/protocol-multiplex.c
@@ -34,7 +34,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		Protocol handler multiplexing
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @author		Michael Baar <baar@inf.fu-berlin.de>
diff --git a/sys/net/protocol-multiplex.h b/sys/net/protocol-multiplex.h
index 43784c152a1d7e8c11fce992d6237e980c1ff148..b324aede5b2e4b18fcc039f6f849d7ab6ed316e6 100644
--- a/sys/net/protocol-multiplex.h
+++ b/sys/net/protocol-multiplex.h
@@ -37,7 +37,7 @@ and the mailinglist (subscription via web site)
  * @internal
  * @brief		Protocol handler multiplexing
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Thomas Hillebrandt <hillebra@inf.fu-berlin.de>
  * @author		Heiko Will <hwill@inf.fu-berlin.de>
  * @author		Michael Baar <baar@inf.fu-berlin.de>
diff --git a/sys/syslog/syslog-out.c b/sys/syslog/syslog-out.c
index 2a5fa75550718b2351bc957992cc265f251b1df3..78a62e0cd28be8db9e3b34ca3fdc2d76aedaac24 100644
--- a/sys/syslog/syslog-out.c
+++ b/sys/syslog/syslog-out.c
@@ -29,7 +29,7 @@ and the mailinglist (subscription via web site)
  * @ingroup		syslog
  * @brief		System Logging Service output implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @version     $Revision: 3854 $
  *
  * @note		$Id: syslog-out.c 3854 2011-12-06 15:27:01Z hwill $
diff --git a/sys/syslog/syslog.c b/sys/syslog/syslog.c
index 8283f60df55c8ac982becbbde46d2940d83ec016..7cd0e083c2f792884cb074d9ea6341cb0cf539ae 100644
--- a/sys/syslog/syslog.c
+++ b/sys/syslog/syslog.c
@@ -33,7 +33,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		System Logging Service implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Michael Baar <baar@inf.fu-berlin.de>
  * @version     $Revision: 3854 $
  *
diff --git a/sys/tracelog/tracelog.c b/sys/tracelog/tracelog.c
index 7249e85138de44d1af16574a47f2073174137a19..0e539f2b1b1ceb5fb432777d2766e5b9f48adb85 100644
--- a/sys/tracelog/tracelog.c
+++ b/sys/tracelog/tracelog.c
@@ -33,7 +33,7 @@ and the mailinglist (subscription via web site)
  * @file
  * @brief		Tracelog implementation
  *
- * @author      Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project
+ * @author      Freie Universität Berlin, Computer Systems & Telematics
  * @author		Michael Baar <baar@inf.fu-berlin.de>
  *
  * @note		$Id: tracelog.c 3854 2011-12-06 15:27:01Z hwill $