diff --git a/_data/scala-compiler-team.yml b/_data/scala-compiler-team.yml
index 6631c878d..9211651ac 100644
--- a/_data/scala-compiler-team.yml
+++ b/_data/scala-compiler-team.yml
@@ -71,7 +71,7 @@
 - name: Sébastien Doeraene
   description: Spec Supervisor, Compiler Engineer
   github: sjrd
-  org: Scala Center
+  org: EPFL
 
 - name: Jędrzej Rochala
   description: Tooling Engineer, Specialised Engineer (Pres. Compiler)
diff --git a/_data/scala-core.yml b/_data/scala-core.yml
index f7c94c38f..72fd1539a 100644
--- a/_data/scala-core.yml
+++ b/_data/scala-core.yml
@@ -35,13 +35,13 @@
   org: VirtusLab
 
 - name: Sébastien Doeraene
-  description: Scala Center Representative, Spec Supervisor
+  description: Scala.js Representative, Spec Supervisor
   image: /scala-core/sjrd.png
   city: Lausanne, Switzerland
   discord: sjrd
   github: sjrd
   twitter: sjrdoeraene
-  org: Scala Center
+  org: EPFL
 
 - name: Lukas Rytz
   description: Akka Representative
@@ -53,7 +53,7 @@
   org: Akka
 
 - name: Tomasz Godzik
-  description: VirtusLab Representative, Coordinator 
+  description: VirtusLab Representative, Coordinator
   image: /scala-core/tgodzik.jpg
   city: Kraków, Poland
   discord: tgodzik
@@ -64,7 +64,7 @@
   org: VirtusLab
 
 - name: Wojciech Mazur
-  description: Scala Native Representative, Release Officer, Community Build Maintainer 
+  description: Scala Native Representative, Release Officer, Community Build Maintainer
   image: /scala-core/wojciech-mazur.jpg
   city: Kraków, Poland
   discord: wmazur
diff --git a/conduct.md b/conduct.md
index d7e43319c..5058c75b2 100644
--- a/conduct.md
+++ b/conduct.md
@@ -95,7 +95,7 @@ listed above,
   choose who you are talking to:
   * Seth Tisue, Scala Core Team ([seth@tisue.net](mailto:seth@tisue.net))
   * Lukas Rytz, Akka ([lukas.rytz@akka.io](mailto:lukas.rytz@akka.io))
-  * Sébastien Doeraene, Scala Center ([sebastien.doeraene@epfl.ch](mailto:sebastien.doeraene@epfl.ch))
+  * Sébastien Doeraene, EPFL ([sebastien.doeraene@epfl.ch](mailto:sebastien.doeraene@epfl.ch))
   * Tomasz Godzik, VirtusLab ([tgodzik@virtuslab.com](mailto:tgodzik@virtuslab.com))
 
 ### Examples of unacceptable behavior