diff --git a/boards/chronos/board_init.c b/boards/chronos/board_init.c
index 7af2183b9fa0685774e5123860eabf17ff0fa2b1..a7cab8136948e166e9abe111a2a1493351a3b184 100644
--- a/boards/chronos/board_init.c
+++ b/boards/chronos/board_init.c
@@ -16,7 +16,7 @@
  * @brief       eZ430-chronos board initialization
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  */
 
diff --git a/boards/chronos/drivers/battery.c b/boards/chronos/drivers/battery.c
index 0dc406838490c14656461251f465c85b3132dc39..2e954d075c03f9cab7f50586bd286ca3ea0db957 100644
--- a/boards/chronos/drivers/battery.c
+++ b/boards/chronos/drivers/battery.c
@@ -16,7 +16,7 @@
  * @brief       eZ430-chronos battery readout (via ADC)
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  */
 
diff --git a/boards/chronos/drivers/buzzer.c b/boards/chronos/drivers/buzzer.c
index b26472c74d7fe03a37bdadd2edb814325540f94c..86d139039d34931380a01ddb9a1450a1dfcf5fa1 100644
--- a/boards/chronos/drivers/buzzer.c
+++ b/boards/chronos/drivers/buzzer.c
@@ -16,7 +16,7 @@
  * @brief       eZ430-chronos beeper
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author      mikoff
  *
  */
diff --git a/boards/chronos/drivers/display.c b/boards/chronos/drivers/display.c
index 6fe37d0d97f570f152bc10a5fd88d0c46a91156d..88f1d977adfe8c458ba1c7b6b405d9484d193a7c 100644
--- a/boards/chronos/drivers/display.c
+++ b/boards/chronos/drivers/display.c
@@ -43,7 +43,7 @@
  * @brief   eZ430-chronos display driver
  *
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  * @author  mikoff
  *
diff --git a/boards/chronos/drivers/display_putchar.c b/boards/chronos/drivers/display_putchar.c
index 1c695dccbd6e713ed8a5b3fbb97830eae1025464..25a1cd58e0e8a684a466c6a997bb2bf65c836e60 100644
--- a/boards/chronos/drivers/display_putchar.c
+++ b/boards/chronos/drivers/display_putchar.c
@@ -17,7 +17,7 @@
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author      Aleksandr Mikoff <sir.enmity@gmail.com>
  *
  */
diff --git a/boards/native/board_config.c b/boards/native/board_config.c
index 176a300bc7951811ece3f6770b043724ed119213..6f98d19712cfb7e627edfc4a347b02b1da9406a3 100644
--- a/boards/native/board_config.c
+++ b/boards/native/board_config.c
@@ -3,7 +3,7 @@
  *
  * No functionality implemented at the moment.
  *
- * Copyright (C) 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -12,7 +12,7 @@
  * @ingroup native_board
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @}
  */
 
diff --git a/boards/native/board_init.c b/boards/native/board_init.c
index fef854b6fe84ca156dcec65cf75d7037f3490a1a..cebdafbbabff6025bad64730f3e216e65803f80e 100644
--- a/boards/native/board_init.c
+++ b/boards/native/board_init.c
@@ -1,7 +1,7 @@
 /**
  * Native Board board_init implementation
  *
- * Copyright (C) 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -10,7 +10,7 @@
  * @ingroup native_board
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @}
  */
 #include <stdio.h>
diff --git a/boards/native/drivers/native-led.c b/boards/native/drivers/native-led.c
index 033c8eb1f33f97d90e70604dc10df74298139bbe..1b6e5c09c6e5113e1a3cfcafddce1e9a04979657 100644
--- a/boards/native/drivers/native-led.c
+++ b/boards/native/drivers/native-led.c
@@ -3,7 +3,7 @@
  *
  * Only prints function calls at the moment.
  *
- * Copyright (C) 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -12,7 +12,7 @@
  * @ingroup native_board
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @}
  */
 
diff --git a/boards/native/include/board.h b/boards/native/include/board.h
index a8b3fa6cda2802b28b523e4987403a4a66485d02..0ec6dd8763f7057a7eaaa237682f5c4b1654560f 100644
--- a/boards/native/include/board.h
+++ b/boards/native/include/board.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -18,7 +18,7 @@
  * @file
  * @brief       Basic definitions for the native board
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #ifndef BOARD_H_
diff --git a/boards/native/include/board_internal.h b/boards/native/include/board_internal.h
index febf56fd19fdb14f1bb74586aed507155831e865..2baf7f9acb21cf774c54d99db135a6f5ce197acc 100644
--- a/boards/native/include/board_internal.h
+++ b/boards/native/include/board_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014 Ludwig Ortmann
+ * Copyright (C) 2013, 2014 Ludwig Knüpfer
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
diff --git a/core/include/kernel_types.h b/core/include/kernel_types.h
index 208f4577bb3c6e41daff8737a6591281b2e1e88b..52315d467da1a338b6553ab918635bbe3d5ae324 100644
--- a/core/include/kernel_types.h
+++ b/core/include/kernel_types.h
@@ -15,7 +15,7 @@
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  * @author      René Kijewski <rene.kijewski@fu-berlin.de>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #ifndef KERNEL_TYPES_H
diff --git a/core/reboot.c b/core/reboot.c
index df52da3bc9ad5b6145bf7258742d9cbc04ab4c0a..de0b154a45dc21b50495c55087361aa413700d3d 100644
--- a/core/reboot.c
+++ b/core/reboot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @file
  * @brief       Reboot function
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de
  *
  * @}
  */
diff --git a/cpu/msp430-common/lpm_cpu.c b/cpu/msp430-common/lpm_cpu.c
index 7346d96fc88a6ad9fa7d28535d8687488c79ecf4..8a0731e549bb8e760055251a79bf176482f06c64 100644
--- a/cpu/msp430-common/lpm_cpu.c
+++ b/cpu/msp430-common/lpm_cpu.c
@@ -14,7 +14,7 @@
  * @brief       low-power mode implementation for MSP430 MCUs
  *
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author      Thomas Eichinger <thomas.eichinger@fu-berlin.de>
  *
  * @}
diff --git a/cpu/native/include/cpu.h b/cpu/native/include/cpu.h
index 2bfe4dbb53d1f5f27f88cf17d50f386d7fe6aa8d..2db6bdb84419f57d118974f0589498f0e6edbc70 100644
--- a/cpu/native/include/cpu.h
+++ b/cpu/native/include/cpu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -14,7 +14,7 @@
  * @ingroup     cpu
  * @brief       CPU abstraction for the native port
  * @{
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #ifndef _CPU_H
diff --git a/cpu/native/include/cpu_conf.h b/cpu/native/include/cpu_conf.h
index aa66e0cd1d1cc4ccaa7fe9d186a74b24597d4ce4..ad6678c881d48e4a3d84b785698834773df40120 100644
--- a/cpu/native/include/cpu_conf.h
+++ b/cpu/native/include/cpu_conf.h
@@ -1,7 +1,7 @@
 /**
  * Native CPU configuration
  *
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -10,7 +10,7 @@
  * @ingroup arch
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @}
  */
 #ifndef CPUCONF_H_
diff --git a/cpu/native/include/native_internal.h b/cpu/native/include/native_internal.h
index 626f879b848a10bcfc52c73baa9604893c92e168..ffd78b7e1211156abd47d8d914a0fbe6de7c8733 100644
--- a/cpu/native/include/native_internal.h
+++ b/cpu/native/include/native_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014 Ludwig Ortmann
+ * Copyright (C) 2013, 2014 Ludwig Knüpfer
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
 /**
  * @addtogroup    native_cpu
  * @{
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #ifndef _NATIVE_INTERNAL_H
diff --git a/cpu/native/include/periph_conf.h b/cpu/native/include/periph_conf.h
index d8bda7b2887fe7bfd10d2d516ca97e949d7b2c48..9954cffbd0c1615c54776b6d2368b194b11a0993 100644
--- a/cpu/native/include/periph_conf.h
+++ b/cpu/native/include/periph_conf.h
@@ -1,7 +1,7 @@
 /**
  * Native CPU peripheral configuration
  *
- * Copyright (C) 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -10,7 +10,7 @@
  * @ingroup native_cpu
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #ifndef PERIPH_CONF_H
diff --git a/cpu/native/irq_cpu.c b/cpu/native/irq_cpu.c
index 16fcbcbce74ef82836d9dfdab6af16000241d20b..7e77320707283608edb0369eca9b903021ff99e7 100644
--- a/cpu/native/irq_cpu.c
+++ b/cpu/native/irq_cpu.c
@@ -1,7 +1,7 @@
 /**
  * Native CPU irq.h implementation
  *
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -11,7 +11,7 @@
  * @ingroup irq
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #include <err.h>
diff --git a/cpu/native/lpm_cpu.c b/cpu/native/lpm_cpu.c
index d706661623004f6d746d451d8871aeab051da52d..0b15e63eba3580963a6566ad045809645441982e 100644
--- a/cpu/native/lpm_cpu.c
+++ b/cpu/native/lpm_cpu.c
@@ -3,7 +3,7 @@
  *
  * Uses system calls to emulate CPU power modes.
  *
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @ingroup native_cpu
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @}
  */
 #include <stdio.h>
diff --git a/cpu/native/native_cpu.c b/cpu/native/native_cpu.c
index 3fd0626ef510ca30957ede47ba450d1f45353e01..44ab42808b55370af07821822b1d8665d32d659f 100644
--- a/cpu/native/native_cpu.c
+++ b/cpu/native/native_cpu.c
@@ -4,7 +4,7 @@
  * in-process preemptive context switching utilizes POSIX ucontexts.
  * (ucontext provides for architecture independent stack handling)
  *
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @ingroup native_cpu
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #include <stdio.h>
diff --git a/cpu/native/netdev2_tap/netdev2_tap.c b/cpu/native/netdev2_tap/netdev2_tap.c
index 8c9a32f5460fb537d0e7e920fc96a11b05f68937..c881a46b0d708016dd1a9c8ede5c6332cf0f782e 100644
--- a/cpu/native/netdev2_tap/netdev2_tap.c
+++ b/cpu/native/netdev2_tap/netdev2_tap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>,
+ * Copyright (C) 2015 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>,
  *                    Martine Lenders <mlenders@inf.fu-berlin.de>
  *                    Kaspar Schleiser <kaspar@schleiser.de>
  *                    Ell-i open source co-operative
diff --git a/cpu/native/panic.c b/cpu/native/panic.c
index 42945cba223198ac788de642959b90c26c32dd6d..db01b54ce402badf4a944bba20ee0cb7425a8430 100644
--- a/cpu/native/panic.c
+++ b/cpu/native/panic.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Crash handling functions implementation for 'native' port
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author      Kévin Roussel <Kevin.Roussel@inria.fr>
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  */
diff --git a/cpu/native/periph/random.c b/cpu/native/periph/random.c
index 9fe1dcae10969b8dea0ae8af06e588c214dda947..a4fff6356d3d1fe5c33c5ba1773952795c903ea4 100644
--- a/cpu/native/periph/random.c
+++ b/cpu/native/periph/random.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -11,7 +11,7 @@
  * @defgroup    native_rng
  * @{
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #include <string.h>
diff --git a/cpu/native/periph/rtc.c b/cpu/native/periph/rtc.c
index 23b066c39b79f78a3a8d3228fd39fda1db616e11..2a77ee06ad510da2c53ed1e50a90b597d39c477f 100644
--- a/cpu/native/periph/rtc.c
+++ b/cpu/native/periph/rtc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013, 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -12,7 +12,7 @@
  * The implementation uses POSIX system calls to emulate a real-time
  * clock based on the system clock.
  *
- * @author Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @ingroup _native_cpu
  * @defgroup _native_rtc
diff --git a/cpu/native/periph/timer.c b/cpu/native/periph/timer.c
index bb6023a2e3372d9de306226b70d97e595f6a37a2..101304ced64252f205a3749eec0ff28c935732d9 100644
--- a/cpu/native/periph/timer.c
+++ b/cpu/native/periph/timer.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *               2015 Kaspar Schleiser <kaspar@schleiser.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
@@ -9,14 +9,14 @@
  * @ingroup timer
  * @ingroup native_cpu
  * @{
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author  Kaspar Schleiser <kaspar@schleiser.de>
  * @file
  * @brief Native CPU periph/timer.h implementation
  *
  * Uses POSIX realtime clock and POSIX itimer to mimic hardware.
  *
- * This is based on native's hwtimer implementation by Ludwig Ortmann.
+ * This is based on native's hwtimer implementation by Ludwig Knüpfer.
  * I removed the multiplexing, as xtimer does the same. (kaspar)
  *
  * @}
diff --git a/cpu/native/startup.c b/cpu/native/startup.c
index 1a828fc91456031826c4d39541dbd3c9846d4447..2d138daeec6cacdbe0706f2ff2bb707e5960793a 100644
--- a/cpu/native/startup.c
+++ b/cpu/native/startup.c
@@ -1,7 +1,7 @@
 /**
  * Native CPU entry code
  *
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -10,7 +10,7 @@
  * @ingroup arch
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @}
  */
 
diff --git a/cpu/native/syscalls.c b/cpu/native/syscalls.c
index a2cab09d5ca01bd9877564ab13ef2345bf48333b..83ce8ba5f7a134ac1897a11e81b53e6fb8c7c1a6 100644
--- a/cpu/native/syscalls.c
+++ b/cpu/native/syscalls.c
@@ -4,7 +4,7 @@
  * Wrap system calls and system call invoking library calls to make
  * sure no context switches happen during a system call.
  *
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @ingroup native_cpu
  * @{
  * @file
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #ifndef _GNU_SOURCE
diff --git a/cpu/native/tramp.S b/cpu/native/tramp.S
index 7cf13991c375eb9ff6e3863a2b3d7ae936963bae..d90760c863e342ebe05a2ec6f908385393a2023d 100644
--- a/cpu/native/tramp.S
+++ b/cpu/native/tramp.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013, 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * Copyright (C) 2014 Thomas Eichinger <thomas.eichinger1@gmail.com>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
diff --git a/dist/tools/cppcheck/check.sh b/dist/tools/cppcheck/check.sh
index e27e9bae2d2c7f71c10c5dfa0c16bd63b456a61c..3553bcda81e498cf7cca6b564b61b60eabbd70dd 100755
--- a/dist/tools/cppcheck/check.sh
+++ b/dist/tools/cppcheck/check.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+# Copyright 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
 # Copyright 2014 Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de>
 #
 # This file is subject to the terms and conditions of the GNU Lesser
diff --git a/dist/tools/externc/check.sh b/dist/tools/externc/check.sh
index b5ad6d0631be601c8c6aad14ee857670a2d73d0e..f495e5d576b53e1040b43a892767375b1db29fcb 100755
--- a/dist/tools/externc/check.sh
+++ b/dist/tools/externc/check.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+# Copyright 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
 # Copyright 2014 DangNhat Pham-Huu <51002279@hcmut.edu.vn>
 #
 # This file is subject to the terms and conditions of the GNU Lesser
diff --git a/dist/tools/licenses/check.sh b/dist/tools/licenses/check.sh
index d449c886bd405b75be568dd2f8d696f504dec4f1..f860b82eafbb4493c11448e1865c6099d4f58ecf 100755
--- a/dist/tools/licenses/check.sh
+++ b/dist/tools/licenses/check.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+# Copyright 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
 #
 # This file is subject to the terms and conditions of the GNU Lesser
 # General Public License v2.1. See the file LICENSE in the top level
diff --git a/dist/tools/usb-serial/list-ttys.sh b/dist/tools/usb-serial/list-ttys.sh
index ac222add4da4f7c7840363503b1428771f0bc800..38fc5cecdc4129d1cbd8f8412e9ddcccff690ad2 100755
--- a/dist/tools/usb-serial/list-ttys.sh
+++ b/dist/tools/usb-serial/list-ttys.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2015 Eistec AB
-# Copyright (C) 2015 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+# Copyright (C) 2015 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
 #
 # This file is subject to the terms and conditions of the GNU Lesser General
 # Public License v2.1. See the file LICENSE in the top level directory for more
diff --git a/drivers/dht/dht.c b/drivers/dht/dht.c
index a84627494c2e8c4c85b685a96b703d895ee55934..e9d2b7487aeac6b88c3c6f3f06813eb19ab4945b 100644
--- a/drivers/dht/dht.c
+++ b/drivers/dht/dht.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Ludwig Ortmann
+ * Copyright 2015 Ludwig Knüpfer
  * Copyright 2015 Christian Mehlis
  *
  * This file is subject to the terms and conditions of the GNU Lesser
@@ -15,7 +15,7 @@
  * @brief       Device driver implementation for the DHT 11 and 22
  *              temperature and humidity sensor
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  *
  * @}
diff --git a/drivers/include/dht.h b/drivers/include/dht.h
index 54994ffe4628ba9ba6f19ffc679b0b032baae34b..38382ffe9eeac05b992950934db4c944213d0cb7 100644
--- a/drivers/include/dht.h
+++ b/drivers/include/dht.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Ludwig Ortmann, Christian Mehlis
+ * Copyright 2015 Ludwig Knüpfer, Christian Mehlis
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -18,7 +18,7 @@
  * @brief       Device driver interface for the DHT family of humidity
  *              and temperature sensors
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  */
 
diff --git a/drivers/include/isl29125.h b/drivers/include/isl29125.h
index 6dc968a63425ef1211ca32efb5552982381c1106..b9b9e5ac6f3c56f226b90d98ca2f290b216b714b 100644
--- a/drivers/include/isl29125.h
+++ b/drivers/include/isl29125.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Ludwig Ortmann
+ * Copyright 2015 Ludwig Knüpfer
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -39,7 +39,7 @@
  * @file
  * @brief       Device driver interface for the ISL29125 RGB light sensor
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de
  */
 
 #ifndef ISL29125_H
diff --git a/drivers/include/pir.h b/drivers/include/pir.h
index 13c0e249e2afd671ff6c7ede1fdef57c9e87a4e1..a49476d8cf009fd98b26fe55198db97d09f6cf4c 100644
--- a/drivers/include/pir.h
+++ b/drivers/include/pir.h
@@ -15,7 +15,7 @@
  * @file
  * @brief       Device driver interface for the PIR motion sensor
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #ifndef PIR_H
diff --git a/drivers/isl29125/include/isl29125-internal.h b/drivers/isl29125/include/isl29125-internal.h
index b1c103ebf31343f3e5cdda8113f9018405ca066f..ba345bf0cb3b7ee7eace164570fd119564d98741 100644
--- a/drivers/isl29125/include/isl29125-internal.h
+++ b/drivers/isl29125/include/isl29125-internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Ludwig Ortmann
+ * Copyright 2015 Ludwig Knüpfer
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @file
  * @brief       Definitions for the ISL29125 RGB light sensor
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  */
 
 #ifndef ISL29125_INTERNAL_H
diff --git a/drivers/isl29125/isl29125.c b/drivers/isl29125/isl29125.c
index d722b0fb3e8f5031e6edc2422dc9552cc7729af3..7289afddb8a33ee3b9ab7b6298912c640ea0fd05 100644
--- a/drivers/isl29125/isl29125.c
+++ b/drivers/isl29125/isl29125.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Ludwig Ortmann
+ * Copyright 2015 Ludwig Knüpfer
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @file
  * @brief       Device driver implementation for the ISL29125 RGB light sensor
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */
diff --git a/drivers/pir/pir.c b/drivers/pir/pir.c
index 3a7c8a49f02a156873b513d39c235bf86cd73067..c76f3a52d4a5973f6d3dd697097aaca660a89652 100644
--- a/drivers/pir/pir.c
+++ b/drivers/pir/pir.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Device driver implementation for the PIR motion sensor
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */
diff --git a/examples/default/main.c b/examples/default/main.c
index c43f9e7f5be1dac790802ab84b5a65b420973010..76f56276410176ed2af1a5106bafb6926305d57f 100644
--- a/examples/default/main.c
+++ b/examples/default/main.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2008, 2009, 2010  Kaspar Schleiser <kaspar@schleiser.de>
  * Copyright (C) 2013 INRIA
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -17,7 +17,7 @@
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */
diff --git a/examples/hello-world/main.c b/examples/hello-world/main.c
index f735bba3ee8294baac5dbe7aca714deef07989f7..f51bf8c0a0ffbe02204b99f3306003af09c25762 100644
--- a/examples/hello-world/main.c
+++ b/examples/hello-world/main.c
@@ -14,7 +14,7 @@
  * @brief       Hello World application
  *
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */
diff --git a/pkg/libcoap/0003-Remove-two-example-programs-in-root.patch b/pkg/libcoap/0003-Remove-two-example-programs-in-root.patch
index 8c8492bdd3b87d3fb79e9a19c338300308e639ea..9e560df5f0c833277e013656755f39abf645eea8 100644
Binary files a/pkg/libcoap/0003-Remove-two-example-programs-in-root.patch and b/pkg/libcoap/0003-Remove-two-example-programs-in-root.patch differ
diff --git a/pkg/libcoap/0005-fix-old-style-function-declarations.patch b/pkg/libcoap/0005-fix-old-style-function-declarations.patch
index 7a264f9d2c4e5a3da63923543be596e1e815420e..ba25b0dd8d9ce06032a914bc6902989be354c856 100644
Binary files a/pkg/libcoap/0005-fix-old-style-function-declarations.patch and b/pkg/libcoap/0005-fix-old-style-function-declarations.patch differ
diff --git a/sys/shell/commands/sc_rtc.c b/sys/shell/commands/sc_rtc.c
index 1402fd42b97574c7cd2696db4e5f42032aa6b9f3..7f069d01da6bc85c334d2a434e26861484b9cd1c 100644
--- a/sys/shell/commands/sc_rtc.c
+++ b/sys/shell/commands/sc_rtc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2013 INRIA.
- * Copyright 2014 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright 2014 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -15,7 +15,7 @@
  * @brief       Shell command implementation for the peripheral RTC interface
  *
  * @author  Oliver Hahm <oliver.hahm@inria.fr>
- * @author  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>#
+ * @author  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>#
  *
  * @}
  */
diff --git a/sys/shell/commands/sc_sys.c b/sys/shell/commands/sc_sys.c
index a338e233ab379712e9e1741d051fc68be0a7fc82..25d166b270686c3bad7a60c228618ba81cc6a6c5 100644
--- a/sys/shell/commands/sc_sys.c
+++ b/sys/shell/commands/sc_sys.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014  Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2014  Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @file
  * @brief       Shell commands for system calls
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */
diff --git a/sys/shell/commands/shell_commands.c b/sys/shell/commands/shell_commands.c
index c4a3fd02cdfadc422ed1e0df96ec29d55b59d014..f785b1857966612dc523288c54c6279d2261232f 100644
--- a/sys/shell/commands/shell_commands.c
+++ b/sys/shell/commands/shell_commands.c
@@ -15,7 +15,7 @@
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
  * @author      Zakaria Kasmi <zkasmi@inf.fu-berlin.de>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */
diff --git a/sys/uart_stdio/uart_stdio.c b/sys/uart_stdio/uart_stdio.c
index e58a8b2c91013898d30d8f31082b42225004d618..8686b786ddce54bd9af17e3c1fb9075140fdf38c 100644
--- a/sys/uart_stdio/uart_stdio.c
+++ b/sys/uart_stdio/uart_stdio.c
@@ -17,7 +17,7 @@
  * This file implements a UART callback and read/write functions.
  *
  * @author      Oliver Hahm <oliver.hahm@inria.fr>
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author      Kaspar Schleiser <kaspar@schleiser.de>
  *
  * @}
diff --git a/tests/coap/main.c b/tests/coap/main.c
index aae812181c228594d3514096eb55547c5fccdf08..62cfbf359e54d89653db0d90c4942166a15ef85f 100644
--- a/tests/coap/main.c
+++ b/tests/coap/main.c
@@ -10,7 +10,7 @@
  * @file
  * @brief       Check if the libcoap package builds.
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  */
 
diff --git a/tests/driver_dht/main.c b/tests/driver_dht/main.c
index 1cf8f45caf428803d73e7665931b05c49212a614..d71d7f72b96c62efbe62dd8f047635ce3be78d94 100644
--- a/tests/driver_dht/main.c
+++ b/tests/driver_dht/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Ludwig Ortmann, Christian Mehlis
+ * Copyright (C) 2015 Ludwig Knüpfer, Christian Mehlis
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @file
  * @brief       Test application for the dht humidity and temperature sensor driver
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  * @author      Christian Mehlis <mehlis@inf.fu-berlin.de>
  *
  * @}
diff --git a/tests/driver_isl29125/main.c b/tests/driver_isl29125/main.c
index 5241b90ffd8bde7091f97f9735863bec75312519..4b839e3364f33b107c50579eba57e3634860c75d 100644
--- a/tests/driver_isl29125/main.c
+++ b/tests/driver_isl29125/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Ludwig Ortmann
+ * Copyright 2015 Ludwig Knüpfer
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @file
  * @brief       Test application for the ISL29125 RGB light sensor
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */
diff --git a/tests/driver_pir/main.c b/tests/driver_pir/main.c
index 98dbfa2cb3b612f9560f93d04bc04a2535144ae7..6ebae504378f6151a5f827d1e8eb0d5dcd95c174 100644
--- a/tests/driver_pir/main.c
+++ b/tests/driver_pir/main.c
@@ -13,7 +13,7 @@
  * @file
  * @brief       Test application for the PIR motion sensor driver
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */
diff --git a/tests/irq/main.c b/tests/irq/main.c
index b5b2f2b4e59808144e8d6ae1c455d208bda81812..940e3e2fefc351397946614b038f07daf06b5b87 100644
--- a/tests/irq/main.c
+++ b/tests/irq/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * Copyright (C) 2013 Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * This file is subject to the terms and conditions of the GNU Lesser
  * General Public License v2.1. See the file LICENSE in the top level
@@ -13,7 +13,7 @@
  * @file
  * @brief IRQ test application
  *
- * @author      Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
+ * @author      Ludwig Knüpfer <ludwig.knuepfer@fu-berlin.de>
  *
  * @}
  */