diff --git a/AUTHORS b/AUTHORS
index 17c1a51..6818151 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,4 +5,4 @@ Fabian Arrotin <arrfab@centos.org>
 Athmane Madjoudj <athmanem@gmail.com>
 Steve Barnes <steve@echo.id.au>
 Johnny Hughes <johnny@centos.org>
-Christoph Galuschka <christoph.galuschka@tiwag.at>
+Christoph Galuschka <christoph.galuschka@chello.at>
diff --git a/tests/p_firefox/0-install_firefox.sh b/tests/p_firefox/0-install_firefox.sh
index 02e6acc..829a0b7 100755
--- a/tests/p_firefox/0-install_firefox.sh
+++ b/tests/p_firefox/0-install_firefox.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 # Install firefox
 t_InstallPackage firefox
diff --git a/tests/p_firefox/firefox_test.sh b/tests/p_firefox/firefox_test.sh
index a11927d..0b0fe82 100755
--- a/tests/p_firefox/firefox_test.sh
+++ b/tests/p_firefox/firefox_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 t_Log "Running $0 - basic firefox test."
 
diff --git a/tests/p_freeradius/0-install_freeradius.sh b/tests/p_freeradius/0-install_freeradius.sh
index 39103ed..d0f9ba7 100755
--- a/tests/p_freeradius/0-install_freeradius.sh
+++ b/tests/p_freeradius/0-install_freeradius.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 # Install freeradius
 # On C5 both freeradius and freeradius2 are provided, however only freeradius2-utils are provided as well
diff --git a/tests/p_freeradius/radiusd_test.sh b/tests/p_freeradius/radiusd_test.sh
index c810b2d..0274ead 100755
--- a/tests/p_freeradius/radiusd_test.sh
+++ b/tests/p_freeradius/radiusd_test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 #         Athmane Madjodj <athmanem@gmail.com>
 
 t_Log "Running $0 - freeradius-access test"
diff --git a/tests/p_minicom/0-install_minicom.sh b/tests/p_minicom/0-install_minicom.sh
index 9e80faf..d8a6d90 100755
--- a/tests/p_minicom/0-install_minicom.sh
+++ b/tests/p_minicom/0-install_minicom.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 # Install minicom
 t_InstallPackage minicom
diff --git a/tests/p_minicom/minicom_test.sh b/tests/p_minicom/minicom_test.sh
index 76ed304..6412b91 100755
--- a/tests/p_minicom/minicom_test.sh
+++ b/tests/p_minicom/minicom_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 t_Log "Running $0 - very basic minicom test."
 
diff --git a/tests/p_net-snmp/0-install_snmpd.sh b/tests/p_net-snmp/0-install_snmpd.sh
index c38722e..b1feb08 100755
--- a/tests/p_net-snmp/0-install_snmpd.sh
+++ b/tests/p_net-snmp/0-install_snmpd.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 # Install net-snmp
 t_InstallPackage net-snmp
diff --git a/tests/p_net-snmp/snmpv2c_test.sh b/tests/p_net-snmp/snmpv2c_test.sh
index 26b49c5..35f9779 100755
--- a/tests/p_net-snmp/snmpv2c_test.sh
+++ b/tests/p_net-snmp/snmpv2c_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 t_Log "Running $0 - snmpv2c test"
 
diff --git a/tests/p_net-snmp/snmpv3_test.sh b/tests/p_net-snmp/snmpv3_test.sh
index 1c27351..5328744 100755
--- a/tests/p_net-snmp/snmpv3_test.sh
+++ b/tests/p_net-snmp/snmpv3_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 t_Log "Running $0 - snmpv3 test"
 
diff --git a/tests/p_rrdtool/0-install_rrdtool.sh b/tests/p_rrdtool/0-install_rrdtool.sh
index edc2896..56b9e3d 100755
--- a/tests/p_rrdtool/0-install_rrdtool.sh
+++ b/tests/p_rrdtool/0-install_rrdtool.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 #         Athmane Madjoudj <athmanem@gmail.com>
 
 if (t_GetPkgRel basesystem | grep -q el6)
diff --git a/tests/p_rrdtool/rrdtool_test.sh b/tests/p_rrdtool/rrdtool_test.sh
index 44da773..864ec98 100755
--- a/tests/p_rrdtool/rrdtool_test.sh
+++ b/tests/p_rrdtool/rrdtool_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 # RRD-sample from http://oss.oetiker.ch/rrdtool/doc/rrdcreate.en.html
 
 if (t_GetPkgRel basesystem | grep -q el6)
diff --git a/tests/p_tcpdump/0_install_tcpdump.sh b/tests/p_tcpdump/0_install_tcpdump.sh
index f64d244..ccf1308 100755
--- a/tests/p_tcpdump/0_install_tcpdump.sh
+++ b/tests/p_tcpdump/0_install_tcpdump.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 # Install tcpdump
 t_InstallPackage tcpdump
diff --git a/tests/p_tcpdump/tcpdump_test.sh b/tests/p_tcpdump/tcpdump_test.sh
index 3e4eafc..4bc279e 100755
--- a/tests/p_tcpdump/tcpdump_test.sh
+++ b/tests/p_tcpdump/tcpdump_test.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 #         Athmane Madjoudj <athmanem@gmail.com>
 
 t_Log "Running $0 - TCPdump test"
diff --git a/tests/p_thunderbird/0-install_thunderbird.sh b/tests/p_thunderbird/0-install_thunderbird.sh
index b5d7d58..3cb3fd4 100755
--- a/tests/p_thunderbird/0-install_thunderbird.sh
+++ b/tests/p_thunderbird/0-install_thunderbird.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 # Install thunderbird
 t_InstallPackage thunderbird
diff --git a/tests/p_thunderbird/thunderbird_test.sh b/tests/p_thunderbird/thunderbird_test.sh
index d3a9ec0..9e9fb67 100755
--- a/tests/p_thunderbird/thunderbird_test.sh
+++ b/tests/p_thunderbird/thunderbird_test.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Author: Athmane Madjoudj <athmanem@gmail.com>
-# Author: Christoph Galuschka <christoph.galuschka@tiwag.at>
+# Author: Christoph Galuschka <christoph.galuschka@chello.at>
 
 t_Log "Running $0 - basic thunderbird test."