14 files changed, 25 insertions, 25 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 462b5404b2..18f07376bd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,11 +10,11 @@ We are super happy about this, and are eager to make your experience contributin
 
 This is why we're collecting these notes on how to contribute, and we hope you'll share your experience to improve the process for the next contributor! (Feel free to send a PR for this note, send your thoughts to scala-internals, or tweet about it to @adriaanm.)
 
-By the way, the team at Typesafe is: @adriaanm, @lrytz, @retronym, and @SethTisue.
+By the way, the team at Lightbend (formerly Typesafe) is: @adriaanm, @lrytz, @retronym, @SethTisue, and @szeiger.
 
 ## What kind of PR are you submitting?
 
-Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://www.typesafe.com/contribute/cla/scala), to protect the OSS nature of the code base.
+Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://www.lightbend.com/contribute/cla/scala), to protect the OSS nature of the code base.
 
 You don't need to submit separate PRs for 2.11.x, 2.12.x, and 2.13.x. Any changes accepted on one of these branches will, in time, be merged into the later branches.
 
diff --git a/README.md b/README.md
index ceb5ad596f..64a09a4644 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ This is the official repository for the [Scala Programming Language](http://www.
 
 # How to contribute
 
-To contribute to the Scala Standard Library, Scala Compiler and Scala Language Specification, please send us a [pull request](https://help.github.com/articles/using-pull-requests/#fork--pull) from your fork of this repository! We do have to ask you to sign the [Scala CLA](http://www.typesafe.com/contribute/cla/scala) before we can merge any of your work into our code base, to protect its open source nature.
+To contribute to the Scala Standard Library, Scala Compiler and Scala Language Specification, please send us a [pull request](https://help.github.com/articles/using-pull-requests/#fork--pull) from your fork of this repository! We do have to ask you to sign the [Scala CLA](http://www.lightbend.com/contribute/cla/scala) before we can merge any of your work into our code base, to protect its open source nature.
 
 For more information on building and developing the core of Scala, read on!
 
diff --git a/build.sbt b/build.sbt
index f9538d0b60..d5850766ba 100644
--- a/build.sbt
+++ b/build.sbt
@@ -186,8 +186,8 @@ lazy val commonSettings = clearSourceAndResourceDirectories ++ publishSettings +
             <name>EPFL LAMP</name>
           </developer>
           <developer>
-            <id>Typesafe</id>
-            <name>Typesafe, Inc.</name>
+            <id>Lightbend</id>
+            <name>Lightbend, Inc.</name>
           </developer>
         </developers>
     apiURL.value match {
diff --git a/doc/LICENSE.md b/doc/LICENSE.md
index b16711896c..90bf842420 100644
--- a/doc/LICENSE.md
+++ b/doc/LICENSE.md
@@ -4,7 +4,7 @@ Scala is licensed under the [BSD 3-Clause License](http://opensource.org/license
 
 Copyright (c) 2002-2016 EPFL
 
-Copyright (c) 2011-2016 Typesafe, Inc.
+Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.)
 
 All rights reserved.
 
diff --git a/doc/License.rtf b/doc/License.rtf
index 21beba0e9f..5e4403b69f 100644
--- a/doc/License.rtf
+++ b/doc/License.rtf
@@ -11,7 +11,7 @@
 \fs40 \
 
 \fs26 Copyright (c) 2002-2016 EPFL\
-Copyright (c) 2011-2016 Typesafe, Inc.\
+Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.)\
 All rights reserved.\
 \
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\
diff --git a/src/build/maven/scala-actors-pom.xml b/src/build/maven/scala-actors-pom.xml
index a0ebcecad1..37500bf9ae 100644
--- a/src/build/maven/scala-actors-pom.xml
+++ b/src/build/maven/scala-actors-pom.xml
@@ -44,8 +44,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-compiler-doc-pom.xml b/src/build/maven/scala-compiler-doc-pom.xml
index 8572e55b42..0c33d23d61 100644
--- a/src/build/maven/scala-compiler-doc-pom.xml
+++ b/src/build/maven/scala-compiler-doc-pom.xml
@@ -51,8 +51,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-compiler-interactive-pom.xml b/src/build/maven/scala-compiler-interactive-pom.xml
index ad8192b694..d3e5e0b834 100644
--- a/src/build/maven/scala-compiler-interactive-pom.xml
+++ b/src/build/maven/scala-compiler-interactive-pom.xml
@@ -41,8 +41,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 8ca18f6f14..15546109c8 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -63,8 +63,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-dist-pom.xml b/src/build/maven/scala-dist-pom.xml
index 9477e14285..6788ff0106 100644
--- a/src/build/maven/scala-dist-pom.xml
+++ b/src/build/maven/scala-dist-pom.xml
@@ -68,8 +68,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-library-all-pom.xml b/src/build/maven/scala-library-all-pom.xml
index 3fcf207559..1991bae131 100644
--- a/src/build/maven/scala-library-all-pom.xml
+++ b/src/build/maven/scala-library-all-pom.xml
@@ -81,8 +81,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-library-pom.xml b/src/build/maven/scala-library-pom.xml
index 78fc05a7c3..e27f8fb12f 100644
--- a/src/build/maven/scala-library-pom.xml
+++ b/src/build/maven/scala-library-pom.xml
@@ -39,8 +39,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml
index c21caefcf2..f7f3c8bc08 100644
--- a/src/build/maven/scala-reflect-pom.xml
+++ b/src/build/maven/scala-reflect-pom.xml
@@ -44,8 +44,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>
diff --git a/src/build/maven/scalap-pom.xml b/src/build/maven/scalap-pom.xml
index 236ac999fc..acdd44f19b 100644
--- a/src/build/maven/scalap-pom.xml
+++ b/src/build/maven/scalap-pom.xml
@@ -41,8 +41,8 @@
       <name>EPFL LAMP</name>
     </developer>
     <developer>
-      <id>Typesafe</id>
-      <name>Typesafe, Inc.</name>
+      <id>Lightbend</id>
+      <name>Lightbend, Inc.</name>
     </developer>
   </developers>
 </project>