diff --git a/boards/mulle/board.c b/boards/mulle/board.c
index 3a9977f4aeb32374e18776f3670b45ba88df306d..358ce39a2d516e2bf19056df982d1761cc4123a2 100644
--- a/boards/mulle/board.c
+++ b/boards/mulle/board.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Board specific implementations for the Mulle board
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/boards/mulle/board_config.c b/boards/mulle/board_config.c
index 45cea4afbf19674354d78b7dcc6bfb7c9c8bb77a..9cd70bd23b17642cc4ff9f08a815c7690ac060a2 100644
--- a/boards/mulle/board_config.c
+++ b/boards/mulle/board_config.c
@@ -15,7 +15,7 @@
  * @file
  * @brief       Mulle config module implementation
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @note Waiting for PR #2353 (NVRAM API) before implementing this.
  */
diff --git a/boards/mulle/include/at86rf2xx_params.h b/boards/mulle/include/at86rf2xx_params.h
index 2a6e20700ac5a70f71398972556565dc460764b8..444fe3740d10792865111874efeee79722754080 100644
--- a/boards/mulle/include/at86rf2xx_params.h
+++ b/boards/mulle/include/at86rf2xx_params.h
@@ -15,7 +15,7 @@
  * @brief     at86rf231 board specific configuration
  *
  * @author    Kaspar Schleiser <kaspar@schleiser.de>
- * @author    Joakim Gebart <joakim.gebart@eistec.se>
+ * @author    Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef AT86RF2XX_PARAMS_H_
diff --git a/boards/mulle/include/board.h b/boards/mulle/include/board.h
index 96f385df628384ef7cf2ab864c58bc1b560d1ac6..33362b810a159c6447ea5cb599e9504d07a7d6ea 100644
--- a/boards/mulle/include/board.h
+++ b/boards/mulle/include/board.h
@@ -15,7 +15,7 @@
  * @file
  * @brief       Board specific definitions for the Eistec Mulle IoT board
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef BOARD_H_
diff --git a/boards/mulle/include/periph_conf.h b/boards/mulle/include/periph_conf.h
index 8d8a2dd5b9f7d3736c033f984d966bdea0d2c114..b4572d5c9e3e0e9b47daa6b732d6cc00b7341371 100644
--- a/boards/mulle/include/periph_conf.h
+++ b/boards/mulle/include/periph_conf.h
@@ -14,7 +14,7 @@
  * @file
  * @name        Peripheral MCU configuration for the Eistec Mulle
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef MULLE_PERIPH_CONF_H_
diff --git a/core/atomic.c b/core/atomic.c
index 16e83573b2556bf3ada39ec9cd5a63575ed1e5fc..1a5dcf26c9af45396d5634352f28863cb834b653 100644
--- a/core/atomic.c
+++ b/core/atomic.c
@@ -17,7 +17,7 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/core/c11_atomic.c b/core/c11_atomic.c
index d406e5f6a629a5aa79634c87ed8ef1756065f56e..ee870a7355b77249304b2e3f7262c2900a1600e4 100644
--- a/core/c11_atomic.c
+++ b/core/c11_atomic.c
@@ -29,7 +29,7 @@
  *
  * @see https://gcc.gnu.org/wiki/Atomic/GCCMM/LIbrary
  *
- * @author Joakim Gebart <joakim.gebart@eistec.se>
+ * @author Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #include <stdint.h>
diff --git a/core/include/atomic.h b/core/include/atomic.h
index 1970ead0b215e8d4c85ffeedc510ad7a6a01bd7c..395e57baa50f0102cc2e9361e3dd04ba2a515b3a 100644
--- a/core/include/atomic.h
+++ b/core/include/atomic.h
@@ -15,7 +15,7 @@
  * @brief       Functions for atomic handling of variables
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef ATOMIC_H_
diff --git a/core/mutex.c b/core/mutex.c
index bbc80bc51b959222bf77c0f79144376339e785fa..0e5fa42b5dfb1fd5271a2a60dd814ef55bfc06fc 100644
--- a/core/mutex.c
+++ b/core/mutex.c
@@ -14,7 +14,7 @@
  * @brief       Kernel mutex implementation
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/core/panic.c b/core/panic.c
index b00e0052c51e2c029f147e11270be0d271ef3ae5..d8ecd5867e14c5f98f6b91818af51d16566c0b8e 100644
--- a/core/panic.c
+++ b/core/panic.c
@@ -17,7 +17,7 @@
  *
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  */
 
diff --git a/cpu/cortexm_common/atomic_arch.c b/cpu/cortexm_common/atomic_arch.c
index 640fb794a2e1fcc9498b1405024af74688d6d7c3..b6f3666dd7da1c9d152a1aa83d4d606737810b15 100644
--- a/cpu/cortexm_common/atomic_arch.c
+++ b/cpu/cortexm_common/atomic_arch.c
@@ -15,7 +15,7 @@
  *
  * @author      Stefan Pfeiffer <stefan.pfeiffer@fu-berlin.de>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/cortexm_common/include/cpu.h b/cpu/cortexm_common/include/cpu.h
index aac211c10ab98b5c217bb9de2680dd33689e756b..9cd14039d48759694a2dff021cbbfc5c6e389c68 100644
--- a/cpu/cortexm_common/include/cpu.h
+++ b/cpu/cortexm_common/include/cpu.h
@@ -22,7 +22,7 @@
  *
  * @author      Stefan Pfeiffer <stefan.pfeiffer@fu-berlin.de>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @todo        remove include irq.h once core was adjusted
  */
diff --git a/cpu/cortexm_common/panic.c b/cpu/cortexm_common/panic.c
index 81fec8260981256e3211d1c35cf783fcf0aa6216..de4a578eac146295b0e9cf0c2ee281bcfc2bebfc 100644
--- a/cpu/cortexm_common/panic.c
+++ b/cpu/cortexm_common/panic.c
@@ -15,7 +15,7 @@
  * @brief       Crash handling functions implementation for ARM Cortex-based MCUs
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #include "cpu.h"
diff --git a/cpu/cortexm_common/thread_arch.c b/cpu/cortexm_common/thread_arch.c
index e6eed693e06257682685f0d0389239516bfc7254..eaa69b02a2a84ab52a9c0c01f736871c49a62c52 100644
--- a/cpu/cortexm_common/thread_arch.c
+++ b/cpu/cortexm_common/thread_arch.c
@@ -87,7 +87,7 @@
  *
  * @author      Stefan Pfeiffer <stefan.pfeiffer@fu-berlin.de>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/k60/cpu.c b/cpu/k60/cpu.c
index 9fde6d4fed0f7cef137b827020d249f0a9597f8f..fc91df0df62dedf4951430c99f262c2cb34e825e 100644
--- a/cpu/k60/cpu.c
+++ b/cpu/k60/cpu.c
@@ -17,7 +17,7 @@
  * @file
  * @brief       Implementation of K60 CPU initialization.
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 /** @brief Current core clock frequency */
diff --git a/cpu/k60/include/MK60-comp.h b/cpu/k60/include/MK60-comp.h
index ccd6d52011b59d33cf3fb6a43c6ec26178b9dc29..e4d61a115cbac637ad4831d7520facf7b8b61963 100644
--- a/cpu/k60/include/MK60-comp.h
+++ b/cpu/k60/include/MK60-comp.h
@@ -13,7 +13,7 @@
  * @file
  * @brief           Compatibility definitions between MK60D10.h and MK60DZ10.h
  *
- * @author          Joakim Gebart <joakim.gebart@eistec.se>
+ * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef MK60_COMP_H_
diff --git a/cpu/k60/include/cpu_conf.h b/cpu/k60/include/cpu_conf.h
index 4cd698d06e9f214c036db3da7568e55513f45da4..8de9af9cb52343ab6d0ef1899b368f7c6f5e3c16 100644
--- a/cpu/k60/include/cpu_conf.h
+++ b/cpu/k60/include/cpu_conf.h
@@ -15,7 +15,7 @@
  * @file
  * @brief           Implementation specific CPU configuration options
  *
- * @author          Joakim Gebart <joakim.gebart@eistec.se>
+ * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef CPU_CONF_H_
diff --git a/cpu/k60/include/devio-null.h b/cpu/k60/include/devio-null.h
index e6d161e211c5788d14f8b80837ed6aaa49a3cdc9..72964d9499581cd1ae74e9757a2bfa60888c54ec 100644
--- a/cpu/k60/include/devio-null.h
+++ b/cpu/k60/include/devio-null.h
@@ -13,7 +13,7 @@
  * @file
  * @brief           Device I/O helpers for a no-op device.
  *
- * @author          Joakim Gebart <joakim.gebart@eistec.se>
+ * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 #ifndef DEVIO_NULL_H_
 #define DEVIO_NULL_H_
diff --git a/cpu/k60/include/devio-uart.h b/cpu/k60/include/devio-uart.h
index a6fa143049fbcec89ea55da6b366856d7d4be755..72dbab85899eae2c521b5600e34649cf59809014 100644
--- a/cpu/k60/include/devio-uart.h
+++ b/cpu/k60/include/devio-uart.h
@@ -15,7 +15,7 @@
  * @file
  * @brief           Device I/O helpers for UARTs on K60.
  *
- * @author          Joakim Gebart <joakim.gebart@eistec.se>
+ * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 #ifndef DEVIO_UART_H_
 #define DEVIO_UART_H_
diff --git a/cpu/k60/include/devopttab.h b/cpu/k60/include/devopttab.h
index 9575da065f830ce707e5d2b0a439cc0e2375380b..b83695d2f47943251d8d0367a171aae8413bafc1 100644
--- a/cpu/k60/include/devopttab.h
+++ b/cpu/k60/include/devopttab.h
@@ -19,7 +19,7 @@
  * @file
  * @brief           Device operations table.
  *
- * @author          Joakim Gebart <joakim.gebart@eistec.se>
+ * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 #ifndef DEVOPTTAB_H_
 #define DEVOPTTAB_H_
diff --git a/cpu/k60/lpm_arch.c b/cpu/k60/lpm_arch.c
index 55e8b0c1a8a4686529b8cabf15a0b5dd3d8c224f..68c578ae5e92a85c40d879455e08e2fd6524e6f4 100644
--- a/cpu/k60/lpm_arch.c
+++ b/cpu/k60/lpm_arch.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Implementation of the kernel's power management interface
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/k60/ssp.c b/cpu/k60/ssp.c
index a64bcbf58d79e744c6fe4bc5b3c89fdd64ffc32e..b5fa52c1a7f323b382de27edeb2c192a98008d43 100644
--- a/cpu/k60/ssp.c
+++ b/cpu/k60/ssp.c
@@ -15,7 +15,7 @@
  * @file
  * @brief           Implementation of stack smashing protection helper functions used by GCC's -fstack-protector
  *
- * @author          Joakim Gebart <joakim.gebart@eistec.se>
+ * @author          Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 void *__stack_chk_guard = 0;
diff --git a/cpu/k60/vector.c b/cpu/k60/vector.c
index 4c1c5c7ea1acb3de47181612eb3dfd32c02b513c..80f1732f190efbd9a2e02a3ad1472954aab6dff6 100644
--- a/cpu/k60/vector.c
+++ b/cpu/k60/vector.c
@@ -14,7 +14,7 @@
  *
  * @brief Interrupt vector for K60 MCU.
  *
- * @author Joakim Gebart <joakim.gebart@eistec.se>
+ * @author Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @note It is not necessary to modify this file to define custom interrupt
  * service routines. All symbols are defined weak, it is only necessary to
diff --git a/cpu/kinetis_common/adc.c b/cpu/kinetis_common/adc.c
index 6a410655f8a779c97b697ace8d0562e9fa0c8c02..e2967d13b47a359fe0f4b6cc49265c32bf499ff2 100644
--- a/cpu/kinetis_common/adc.c
+++ b/cpu/kinetis_common/adc.c
@@ -18,7 +18,7 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  * @author      Johann Fischer <j.fischer@phytec.de>
  * @author      Jonas Remmert <j.remmert@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/kinetis_common/dist/check-fcfield-hex.sh b/cpu/kinetis_common/dist/check-fcfield-hex.sh
index c458a22cd7ec63db503bc76a1f05716e21fcf474..0347de86b42b5decc53fe7fddd367ce069941303 100755
--- a/cpu/kinetis_common/dist/check-fcfield-hex.sh
+++ b/cpu/kinetis_common/dist/check-fcfield-hex.sh
@@ -9,7 +9,7 @@
 #
 # @author       Jonas Remmert <j.remmert@phytec.de>
 # @author       Johann Fischer <j.fischer@phytec.de>
-# @author       Joakim Gebart <joakim.gebart@eistec.se>
+# @author       Joakim Nohlgård <joakim.nohlgard@eistec.se>
 
 if [ $# -ne 1 ]; then
     echo "Usage: $0 HEXFILE"
diff --git a/cpu/kinetis_common/fcfield.c b/cpu/kinetis_common/fcfield.c
index 858faab1fe2becae25a3b86eed6ff7db523a8abf..75074f43f43e58adc6f7e7a1c307cc4e72d4347b 100644
--- a/cpu/kinetis_common/fcfield.c
+++ b/cpu/kinetis_common/fcfield.c
@@ -15,7 +15,7 @@
  * @brief       Default FCF code for Freescale Kinetis MCUs
  *
  * @author      Johann Fischer <j.fischer@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/kinetis_common/gpio.c b/cpu/kinetis_common/gpio.c
index 13d0791050c6dd1949fdaf4394d0a1f96f8883f9..10174649298b8b6a79c04d60d18b66dd0f7ad3f1 100644
--- a/cpu/kinetis_common/gpio.c
+++ b/cpu/kinetis_common/gpio.c
@@ -19,7 +19,7 @@
  * @author      Hauke Petersen <mail@haukepetersen.de>
  * @author      Johann Fischer <j.fischer@phytec.de>
  * @author      Jonas Remmert <j.remmert@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  *
  * @}
  */
diff --git a/cpu/kinetis_common/i2c.c b/cpu/kinetis_common/i2c.c
index cc617eb7232fb39942a86ea8f84f910f0406ae54..901c314680aa567f44afc91ab29cb877570a13d4 100644
--- a/cpu/kinetis_common/i2c.c
+++ b/cpu/kinetis_common/i2c.c
@@ -19,7 +19,7 @@
  * @brief       Low-level I2C driver implementation
  *
  * @author      Johann Fischer <j.fischer@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/kinetis_common/include/wdog.h b/cpu/kinetis_common/include/wdog.h
index b699bb4d17b8db24dba88849a85fa8dca04e7df5..1f28e8685f23a76c80257759896a93be56ea1f4e 100644
--- a/cpu/kinetis_common/include/wdog.h
+++ b/cpu/kinetis_common/include/wdog.h
@@ -33,7 +33,7 @@
  * @brief       Interface definition for the Kinetis WDOG driver.
  *
  * @author      Johann Fischer <j.fischer@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef WDOG_H
diff --git a/cpu/kinetis_common/pwm.c b/cpu/kinetis_common/pwm.c
index ecc24429a235c4582597dd6c444dee3abac8632c..e4f59a606d5223a6de74187133f69898d6de0d56 100644
--- a/cpu/kinetis_common/pwm.c
+++ b/cpu/kinetis_common/pwm.c
@@ -19,7 +19,7 @@
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  * @author      Johann Fischer <j.fischer@phytec.de>
  * @author      Jonas Remmert <j.remmert@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/kinetis_common/random_rngb.c b/cpu/kinetis_common/random_rngb.c
index 296d5961b291036346eec3db60ba203f631e15d4..f6e23586de0ef3e52e340ef51542523383cec44d 100644
--- a/cpu/kinetis_common/random_rngb.c
+++ b/cpu/kinetis_common/random_rngb.c
@@ -15,7 +15,7 @@
  * @file
  * @brief       Low-level random number generator driver implementation.
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se> (adaption for Freescale's RNGB)
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se> (adaption for Freescale's RNGB)
  * @author      Johann Fischer <j.fischer@phytec.de> (adaption for Freescale's RNGA)
  * @author      Hauke Petersen <mail@haukepetersen.de>
  *
diff --git a/cpu/kinetis_common/rtc.c b/cpu/kinetis_common/rtc.c
index 4cfaa9e2dfa3754cf081dfef76c1cf4bef2b7300..5d7c0df5c39a3c13008f4fa3739244d7dd783d16 100644
--- a/cpu/kinetis_common/rtc.c
+++ b/cpu/kinetis_common/rtc.c
@@ -14,7 +14,7 @@
  * @file
  * @brief       RTC interface wrapper for use with RTT modules.
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/kinetis_common/rtt.c b/cpu/kinetis_common/rtt.c
index e8ef04eb97a4fb693b3764b8855474ca70329bd9..dc7221d376fda2b7964241d759d15543049c3b1b 100644
--- a/cpu/kinetis_common/rtt.c
+++ b/cpu/kinetis_common/rtt.c
@@ -21,7 +21,7 @@
  *              RTT as a system real time clock.
  *
  * @author      Johann Fischer <j.fischer@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/kinetis_common/spi.c b/cpu/kinetis_common/spi.c
index c21ed67c8f2c3687b2d20c953b99532c1c7485a2..8240d6f78b50e217d95e052e3a1f96614dd07eb7 100644
--- a/cpu/kinetis_common/spi.c
+++ b/cpu/kinetis_common/spi.c
@@ -36,7 +36,7 @@
  *
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  * @author      Johann Fischer <j.fischer@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/kinetis_common/wdog.c b/cpu/kinetis_common/wdog.c
index 55f7cb806f1304e9ec99d73e2d74eae0456b5fc2..60983947ae3cae537cc274bed3ae1fb785051678 100644
--- a/cpu/kinetis_common/wdog.c
+++ b/cpu/kinetis_common/wdog.c
@@ -16,7 +16,7 @@
  * @brief       Low-level WDOG driver implementation
  *
  * @author      Johann Fischer <j.fischer@phytec.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/msp430-common/include/stdio.h b/cpu/msp430-common/include/stdio.h
index 59f620150718646ea69b13c581f56f5f3981b1fe..2ac0b7b0698077f88cca5c6f3844d16b180ec505 100644
--- a/cpu/msp430-common/include/stdio.h
+++ b/cpu/msp430-common/include/stdio.h
@@ -14,7 +14,7 @@
  * @brief       stdio.h wrapper for MSP430
  * @see http://www.cplusplus.com/reference/cstdio/
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  */
 
 #ifndef RIOT_MSP430_STDIO_H_
diff --git a/cpu/msp430-common/include/stdlib.h b/cpu/msp430-common/include/stdlib.h
index 42c4a7d7be24f28bcf37b5a774bc32840b469be5..5e56eeaebe2d9935ec078872a9f57847784cb02b 100644
--- a/cpu/msp430-common/include/stdlib.h
+++ b/cpu/msp430-common/include/stdlib.h
@@ -14,7 +14,7 @@
  * @brief       stdlib.h wrapper for MSP430
  * @see http://www.cplusplus.com/reference/cstdlib/
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  */
 
 #ifndef RIOT_MSP430_STDLIB_H_
diff --git a/cpu/sam3/periph/spi.c b/cpu/sam3/periph/spi.c
index 845bce1038b0b561ae1d049bcb775a76fb535cd0..eef02692c11b6a89912673ced3067c0d8c49425c 100644
--- a/cpu/sam3/periph/spi.c
+++ b/cpu/sam3/periph/spi.c
@@ -16,7 +16,7 @@
  * @author      Maxime Blanloeil <maxime.blanloeil@phelma.grenoble-inp.fr>
  * @author      Peter Kietzmann  <peter.kietzmann@haw-hamburg.de>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/samd21/periph/spi.c b/cpu/samd21/periph/spi.c
index 1193de8e1c7706a16d1b037ee8f807bb924254ba..a7fe85a801ddce28e09bd42c85e3b8f766c2f805 100644
--- a/cpu/samd21/periph/spi.c
+++ b/cpu/samd21/periph/spi.c
@@ -16,7 +16,7 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  * @author      Troels Hoffmeyer <troels.d.hoffmeyer@gmail.com>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/saml21/periph/spi.c b/cpu/saml21/periph/spi.c
index 0f9e7f73780d117ab2e1418d147d4ec8904393f0..8789c31c2b36fb5fd870eaed7c9bd7f018b95fde 100644
--- a/cpu/saml21/periph/spi.c
+++ b/cpu/saml21/periph/spi.c
@@ -18,7 +18,7 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  * @author      Troels Hoffmeyer <troels.d.hoffmeyer@gmail.com>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  *
  * @}
diff --git a/cpu/stm32f0/periph/spi.c b/cpu/stm32f0/periph/spi.c
index 7343732819ef24442e117a1cc2daad19649ba423..9011c64bc784a3757c8d0f2af95e81548832d536 100644
--- a/cpu/stm32f0/periph/spi.c
+++ b/cpu/stm32f0/periph/spi.c
@@ -16,7 +16,7 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  * @author      Hauke Petersen <mail@haukepetersen.de>
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/stm32f1/periph/spi.c b/cpu/stm32f1/periph/spi.c
index 2cbaa187075dac74a23c47e6d1c4896845f574ab..bf6bbbbfe94a4ea00cde581ad9bbee5af2013795 100644
--- a/cpu/stm32f1/periph/spi.c
+++ b/cpu/stm32f1/periph/spi.c
@@ -16,7 +16,7 @@
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/cpu/stm32f3/periph/spi.c b/cpu/stm32f3/periph/spi.c
index 160f5f348bcde6d65dc2a47c9d4903bf9fa2c93a..d1efe8185824c11808ca4511d90f8d54c048ade4 100644
--- a/cpu/stm32f3/periph/spi.c
+++ b/cpu/stm32f3/periph/spi.c
@@ -18,7 +18,7 @@
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  *
  * @}
diff --git a/cpu/stm32l1/periph/spi.c b/cpu/stm32l1/periph/spi.c
index 67b7e3b753d2bf02aa717f68cd69b56b6f6efc45..17c23d230d63a6cb7d0a95babd4622de6a4e1617 100644
--- a/cpu/stm32l1/periph/spi.c
+++ b/cpu/stm32l1/periph/spi.c
@@ -17,7 +17,7 @@
  * @author      Hauke Petersen <mail@haukepetersen.de>
  * @author      Fabian Nack <nack@inf.fu-berlin.de>
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/dist/tools/eclipsesym/cmdline2xml.sh b/dist/tools/eclipsesym/cmdline2xml.sh
index 76acd65c19ea0c4ccac1c55c2c28f36e4637ece2..05833c241bbc841e714e4e2bc6b49c6073b468e2 100755
--- a/dist/tools/eclipsesym/cmdline2xml.sh
+++ b/dist/tools/eclipsesym/cmdline2xml.sh
@@ -6,7 +6,7 @@
 # Public License v2.1. See the file LICENSE in the top level directory for more
 # details.
 
-# Author: Joakim Gebart <joakim.gebart@eistec.se>
+# Author: Joakim Nohlgård <joakim.nohlgard@eistec.se>
 
 # Convert a GCC command line to Eclipse settings for import in
 # Project->Properties->C/C++ General->Paths and Symbols
diff --git a/dist/tools/openocd/openocd.sh b/dist/tools/openocd/openocd.sh
index f66fa45cd9f458eda6a12db4791bb280e0f82568..816fbb2c3a029aefd104a79fd7abe227ee988190 100755
--- a/dist/tools/openocd/openocd.sh
+++ b/dist/tools/openocd/openocd.sh
@@ -59,7 +59,7 @@
 #
 #
 # @author       Hauke Peteresen <hauke.petersen@fu-berlin.de>
-# @author       Joakim Gebart <joakim.gebart@eistec.se>
+# @author       Joakim Nohlgård <joakim.nohlgard@eistec.se>
 
 # default GDB port
 _GDB_PORT=3333
diff --git a/drivers/adt7310/adt7310.c b/drivers/adt7310/adt7310.c
index a9111e3883c956f18b76c2cd863cc41d2f9d59ed..b5214313cbdcbe80f09c2c46194dfff05c8e19c7 100644
--- a/drivers/adt7310/adt7310.c
+++ b/drivers/adt7310/adt7310.c
@@ -15,7 +15,7 @@
  * @brief       Driver for the ADT7310 ±0.5°C Accurate, 16-Bit Digital SPI
  *              Temperature Sensor from Analog Devices
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/drivers/at86rf2xx/at86rf2xx_internal.c b/drivers/at86rf2xx/at86rf2xx_internal.c
index c18d5c576e940d2ba92260f6a3e1c04a86e0f881..99f7b23cf32f34337daa5b7554571c3509ffb279 100644
--- a/drivers/at86rf2xx/at86rf2xx_internal.c
+++ b/drivers/at86rf2xx/at86rf2xx_internal.c
@@ -16,7 +16,7 @@
  *
  * @author      Alaeddine Weslati <alaeddine.weslati@inria.fr>
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
  *
  * @}
diff --git a/drivers/hih6130/hih6130.c b/drivers/hih6130/hih6130.c
index c23b81f7acb9e70f615631d933d92a3ef6f3ca09..5aec96c3a7d7fa95b1e33cd8e23a22b20c83c023 100644
--- a/drivers/hih6130/hih6130.c
+++ b/drivers/hih6130/hih6130.c
@@ -14,7 +14,7 @@
  * @brief       Device driver implementation for Honeywell HumidIcon Digital
  *              Humidity/Temperature Sensors: HIH-6130/6131 Series
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/drivers/ina220/ina220.c b/drivers/ina220/ina220.c
index 76b50d7a668bf9213e39e4857b6ad89a501ccbc7..7f0cfe0d7f60bb5357f0066bb80870601d8286a4 100644
--- a/drivers/ina220/ina220.c
+++ b/drivers/ina220/ina220.c
@@ -15,7 +15,7 @@
  *              or Low Side, Bi-Directional CURRENT/POWER MONITOR with Two-Wire
  *              Interface
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/drivers/ina220/include/ina220-regs.h b/drivers/ina220/include/ina220-regs.h
index e0b19e7f8cb0e023041e1bc27324270eb198ee81..13bf8f1c70c239428b88c499c292954ae84f5490 100644
--- a/drivers/ina220/include/ina220-regs.h
+++ b/drivers/ina220/include/ina220-regs.h
@@ -15,7 +15,7 @@
  *              Side, Bi-Directional CURRENT/POWER MONITOR with Two-Wire
  *              Interface
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef INA220_REGS_H
diff --git a/drivers/include/adt7310.h b/drivers/include/adt7310.h
index 91ecb51dce118e37b92432f9711dc0f0f3a0d83f..e2ba512bcffa74a19f38f82bab4a8668d6a2bfa6 100644
--- a/drivers/include/adt7310.h
+++ b/drivers/include/adt7310.h
@@ -44,7 +44,7 @@
  * @file
  * @brief       Interface definition for the ADT7310 sensor driver.
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef ADT7310_H_
diff --git a/drivers/include/hih6130.h b/drivers/include/hih6130.h
index 92c7780f0364c70291c9cf7dd50fdf94c138981f..8c39d9a0333e304f9c307acfc2581a107254f78d 100644
--- a/drivers/include/hih6130.h
+++ b/drivers/include/hih6130.h
@@ -17,7 +17,7 @@
  * @brief       Device driver for Honeywell HumidIcon Digital
  *              Humidity/Temperature Sensors: HIH-6130/6131 Series
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef HIH6130_H_
diff --git a/drivers/include/ina220.h b/drivers/include/ina220.h
index cc61792645f2de5e495db099589c74e4a9c5f79a..15077b51395f18d97296cafa15ec777aa5178184 100644
--- a/drivers/include/ina220.h
+++ b/drivers/include/ina220.h
@@ -18,7 +18,7 @@
  *              Side, Bi-Directional CURRENT/POWER MONITOR with Two-Wire
  *              Interface
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef INA220_H
diff --git a/drivers/include/lis3dh.h b/drivers/include/lis3dh.h
index b2cf6b912a6a2c46520148649c1eeadbd0fc5f07..efc25b12ba6b25b2c14ab1d339e353e393159302 100644
--- a/drivers/include/lis3dh.h
+++ b/drivers/include/lis3dh.h
@@ -16,7 +16,7 @@
  * @brief       Device driver interface for the LIS3DH accelerometer
  *
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef LIS3DH_H_
diff --git a/drivers/include/nvram-spi.h b/drivers/include/nvram-spi.h
index a945b3adb84fd6e9f26f4f4785630ea0253cfc28..e8699f314a616f4dfc90e9d0579b9602efc1e584 100644
--- a/drivers/include/nvram-spi.h
+++ b/drivers/include/nvram-spi.h
@@ -17,7 +17,7 @@
  * Tested on:
  * - Cypress/Ramtron FM25L04B.
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef DRIVERS_NVRAM_SPI_H_
diff --git a/drivers/include/nvram.h b/drivers/include/nvram.h
index 7ec41e953c220cd3aed1b77df9c1485af8a60900..d7384646202fcb3d1b0f2fec58271560e396129a 100644
--- a/drivers/include/nvram.h
+++ b/drivers/include/nvram.h
@@ -21,7 +21,7 @@
  * @file
  *
  * @brief       Generic non-volatile RAM driver interface
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef DRIVERS_NVRAM_H_
diff --git a/drivers/include/servo.h b/drivers/include/servo.h
index a019a7e5ebd5d522abbf2b5240e6b0e8cb25e58b..c264f4ff742f5021092e24579aae9a74914a970f 100644
--- a/drivers/include/servo.h
+++ b/drivers/include/servo.h
@@ -17,7 +17,7 @@
  * @brief       High-level driver for easy handling of servo motors
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef SERVO_H
diff --git a/drivers/lis3dh/lis3dh.c b/drivers/lis3dh/lis3dh.c
index 05789722387102371bc4145031ae86fa37cc3eb0..3c669b7e7894af39085d0be6f50096610a1f8c90 100644
--- a/drivers/lis3dh/lis3dh.c
+++ b/drivers/lis3dh/lis3dh.c
@@ -19,7 +19,7 @@
  * @file
  * @brief  Implementation of LIS3DH SPI driver
  *
- * @author Joakim Gebart <joakim.gebart@eistec.se>
+ * @author Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 
diff --git a/drivers/nrf24l01p/nrf24l01p.c b/drivers/nrf24l01p/nrf24l01p.c
index e1976e65136fcd7129432b42afb4645418b75cd5..0decdee20851f6d121ab8798299d77106cbb4856 100644
--- a/drivers/nrf24l01p/nrf24l01p.c
+++ b/drivers/nrf24l01p/nrf24l01p.c
@@ -10,7 +10,7 @@
  * @ingroup     drivers_nrf24l01p
  * @{
  * @author      Peter Kietzmann <peter.kietzmann@haw-hamburg.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  * @}
  */
 #include "nrf24l01p.h"
diff --git a/drivers/nvram_spi/nvram-spi.c b/drivers/nvram_spi/nvram-spi.c
index 941e2c42d71c77f8f728fee1838552c32f58be42..319f6e0bcb1b2fb12b9e12edebb625973701337a 100644
--- a/drivers/nvram_spi/nvram-spi.c
+++ b/drivers/nvram_spi/nvram-spi.c
@@ -26,7 +26,7 @@
  * Tested on:
  * - Cypress/Ramtron FM25L04B.
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 typedef enum {
diff --git a/drivers/servo/servo.c b/drivers/servo/servo.c
index 5fc9f456f0c8b3a6ae51756b45317b984f3f2659..91699370d183fa8a66517f4f46e15b1ae48a9bfa 100644
--- a/drivers/servo/servo.c
+++ b/drivers/servo/servo.c
@@ -15,7 +15,7 @@
  * @brief       Servo motor driver implementation
  *
  * @author      Hauke Petersen <hauke.petersen@fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/sys/cpp11-compat/cppsupport.cpp b/sys/cpp11-compat/cppsupport.cpp
index deeacf145d7197b70e6aa86d1438d069f7a5edf6..f37f2846807a5e3b47b6621bc7f530452c9e604d 100644
--- a/sys/cpp11-compat/cppsupport.cpp
+++ b/sys/cpp11-compat/cppsupport.cpp
@@ -15,7 +15,7 @@
  *
  * Tested with GCC-4.9.2 and Clang-3.6
  *
- * @author  Joakim Gebart <joakim.gebart@eistec.se>
+ * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #include <new>
diff --git a/sys/hashes/hashes.c b/sys/hashes/hashes.c
index 8b85642d1f7fabc91f831e28363656941b34ff1a..8992c39155db599af635dfda40db28c55aea5e30 100644
--- a/sys/hashes/hashes.c
+++ b/sys/hashes/hashes.c
@@ -12,7 +12,7 @@
  * @file
  * @author      Jason Linehan <patientulysses@gmail.com>
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #include "hashes.h"
diff --git a/sys/include/hashes.h b/sys/include/hashes.h
index c03848b12c9639837936567bc645d41555b5b371..fb370d2dad8d0417440df9179e52d647c1dd49c7 100644
--- a/sys/include/hashes.h
+++ b/sys/include/hashes.h
@@ -17,7 +17,7 @@
  *
  * @author      Jason Linehan <patientulysses@gmail.com>
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  */
 
 #ifndef HASHES_H_
diff --git a/sys/posix/pthread/pthread_spin.c b/sys/posix/pthread/pthread_spin.c
index 4c5fcba1941b1d288b2780e7dc5e76951b4a3ad7..39b330dc7aadab0ef0c1e24c841fcaf7200c6f05 100644
--- a/sys/posix/pthread/pthread_spin.c
+++ b/sys/posix/pthread/pthread_spin.c
@@ -13,7 +13,7 @@
  * @brief   Spin locks.
  * @author  Christian Mehlis <mehlis@inf.fu-berlin.de>
  * @author  René Kijewski <kijewski@inf.fu-berlin.de>
- * @author  Joakim Gebart <joakim.gebart@eistec.se>
+ * @author  Joakim Nohlgård <joakim.nohlgard@eistec.se>
  * @}
  */
 
diff --git a/tests/driver_adt7310/main.c b/tests/driver_adt7310/main.c
index 3ced07c3a06669a0fa7b872aad47221047cde948..c9eef6cb1fdf2c5e0149aac3873d4a3d723dce75 100644
--- a/tests/driver_adt7310/main.c
+++ b/tests/driver_adt7310/main.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Test application for the ADT7310 accelerometer driver
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  *
  * @}
  */
diff --git a/tests/driver_hih6130/main.c b/tests/driver_hih6130/main.c
index a7b7821c496d11dce8dfdb3eeb4b50b8e3c120f7..3a30bcf6fb23ce68a2eb4ca61eb87d6f9b8c5f7f 100644
--- a/tests/driver_hih6130/main.c
+++ b/tests/driver_hih6130/main.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Test application for the HIH6130 sensor driver
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/tests/driver_ina220/main.c b/tests/driver_ina220/main.c
index cb578f305a2675ba43495a755c2cdf49fb35931f..f2ec50e348c4beebd5082e27bd625f0f5002c33a 100644
--- a/tests/driver_ina220/main.c
+++ b/tests/driver_ina220/main.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Test application for the INA220 sensor driver
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/tests/driver_lis3dh/main.c b/tests/driver_lis3dh/main.c
index b32a557e1a07b7030e44d2580304c75fa4894ed4..1dfa996d032a0ca06c11f19e249f265c9e103cbc 100644
--- a/tests/driver_lis3dh/main.c
+++ b/tests/driver_lis3dh/main.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Test application for the LIS3DH accelerometer driver
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  *
  * @}
  */
diff --git a/tests/driver_nvram_spi/main.c b/tests/driver_nvram_spi/main.c
index 0157d956ffa589211c76e3c0cf97ef07f292cfb7..c4e701967185f1c1ebd8d37405e8180060bf458c 100644
--- a/tests/driver_nvram_spi/main.c
+++ b/tests/driver_nvram_spi/main.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Test application for the SPI NVRAM driver
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se
  *
  * @}
  */
diff --git a/tests/driver_servo/main.c b/tests/driver_servo/main.c
index 07da6bcacb41ce100e39b62a459703c6cb361b9f..4308c953c0238898b7bdcc2b3979934d3cfa0e15 100644
--- a/tests/driver_servo/main.c
+++ b/tests/driver_servo/main.c
@@ -17,7 +17,7 @@
  * 1.000 -- 2.000 ms, roughly -/+ 90 degrees from the middle position if the
  * connected servo is a standard RC servo.
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */
diff --git a/tests/pkg_cmsis-dsp/main.c b/tests/pkg_cmsis-dsp/main.c
index 51c7fd0b0651849cc572f2e8cd34d345d537537a..44c2846d6a8970558fa2eea9a838ec2565e2bb18 100644
--- a/tests/pkg_cmsis-dsp/main.c
+++ b/tests/pkg_cmsis-dsp/main.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       ARM DSP library test application
  *
- * @author      Joakim Gebart <joakim.gebart@eistec.se>
+ * @author      Joakim Nohlgård <joakim.nohlgard@eistec.se>
  *
  * @}
  */