diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 45e23d0..8a8f623 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -72,7 +72,7 @@ This code of conduct and its related procedures also applies to unacceptable beh
 
 **To report or discuss a suspected violation of this code of conduct by a community member, you may contact any of the team directly and in confidence**:
 
-- Bastian Greshake
+- Bastian Greshake Tzovaras
 - Philipp Bayer
 - Helge Rausch
 
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 91f9e6a..3edacd7 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -5,7 +5,7 @@
       <h3 class="news__single-news-title">A redesign! A survey!</h3>
       <p>
         As part of last year's Google Summer of Code, Mateus Jabour worked on a more modern, responsive design of openSNP. Only now did we find the time to incorporate his proposed changes which is why  you're seeing a new page! There are still some minor kinks and problems to iron out, if you find something, please don't hesitate to contact us at info@opensnp.org!<br/>
-        The results of a recent survey with openSNP users studying the motivations behind medical data sharing has been published in PLOS ONE: <a href='http://journals.plos.org/plosone/article?id=10.1371/journal.pone.0177158'>Open sharing of genomic data: Who does it and why?</a>. Tobias Haeusermann and Bastian Greshake wrote an article about the survey for repositive.io: <a href='https://blog.repositive.io/is-sharing-always-caring-on-open-genomic-data-sharing-and-why-people-do-it-2/'>Is sharing always caring? On open genomic data sharing and why people do it.</a>.
+        The results of a recent survey with openSNP users studying the motivations behind medical data sharing has been published in PLOS ONE: <a href='http://journals.plos.org/plosone/article?id=10.1371/journal.pone.0177158'>Open sharing of genomic data: Who does it and why?</a>. Tobias Haeusermann and Bastian Greshake Tzovaras wrote an article about the survey for repositive.io: <a href='https://blog.repositive.io/is-sharing-always-caring-on-open-genomic-data-sharing-and-why-people-do-it-2/'>Is sharing always caring? On open genomic data sharing and why people do it.</a>.
       </p>
       <span class="news__single-news-date">2017-06-02</span>
     </li>
diff --git a/app/views/static/about_us.html.erb b/app/views/static/about_us.html.erb
index 9423ac0..2a42d25 100644
--- a/app/views/static/about_us.html.erb
+++ b/app/views/static/about_us.html.erb
@@ -13,7 +13,7 @@
       <h4>Who's running the openSNP.org infrastructure?</h4>
       <p>
       The bulk of the coding was done by
-      <a href="http://www.twitter.com/gedankenstuecke">Bastian Greshake</a>,
+      <a href="http://www.twitter.com/gedankenstuecke">Bastian Greshake Tzovaras</a>,
       <a href="http://twitter.com/helgerausch">Helge Rausch</a> and
       <a href="http://twitter.com/PhilippBayer">Philipp Bayer</a>,
       who are also taking care of running and maintaining the live website.
diff --git a/public/humans.txt b/public/humans.txt
index e57249f..7f2fe98 100644
--- a/public/humans.txt
+++ b/public/humans.txt
@@ -14,7 +14,7 @@
         Twitter: @philippbayer
         Location: Perth, Australia
 
-        Bastian Greshake
+        Bastian Greshake Tzovaras
         Contact: bgreshake@gmail.com
         Site: ruleofthirds.de
         Twitter: @gedankenstuecke
@@ -29,11 +29,11 @@
         Graham Dyer
         Site: https://sxibolet.2pitau.org/
         Location: Champaign, IL, United States
-        
+
         Mateus Jabour
         Site: http://mateusjabour.github.io/
         Location: Montreal, Canada
-        
+
         Vivek Rai
         Site: https://vivekiitkgp.github.io
         Location: Kharagpur, India
@@ -48,10 +48,10 @@
         Andrea Bedini (https://github.com/andreabedini)
         Amie Fairs (https://github.com/amiefairs)
         Gerrit (https://github.com/gvd)
-        
+
 /* THANKS /*
         Fabian Zimmer (designer of our first logo!)
-        Elio Qoshi (@elioqoshi, who did our updated logo and sticker design!) 
+        Elio Qoshi (@elioqoshi, who did our updated logo and sticker design!)
         Ian Logan
         Madeleine Ball
         John Wilbanks