diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000000000..2d4381725
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,14 @@
+# This is the list of xi-editor authors for copyright purposes.
+#
+# This does not necessarily list everyone who has contributed code, since in
+# some cases, their employer may be the copyright holder.  To see the full list
+# of contributors, see the revision history in source control.
+Google LLC
+Colin Rofls
+Tristan Hume
+Anna Scholtz
+David Tolnay
+Pranjal Paliwal
+Araz Abishov
+Lê Viết Hoàng Dũng
+Markus Ast
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 48f8e690d..780e9c103 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -25,7 +25,7 @@ subject to the following rules:
 
 * Managing issues and merging trivial PR's (comments, doc fixes, etc) are fine.
 
-* A Google-employed project member should approve all nontrivial PR's by non-Googlers.
+* Every patch should be approved by a collaborator other than the author.
 
 * We wait for CI to be green, unless there is a really compelling reason.
 
@@ -33,6 +33,9 @@ subject to the following rules:
   gives the author a chance to make last-minute fixes). Otherwise, the approver
   generally merges.
 
+If your name does not already appear in the [AUTHORS] file, please feel free to
+add it as part of your patch.
+
 ### Code of conduct
 
 We are committed to preserving and fostering a diverse, welcoming community. This
diff --git a/doc/cache-sim.html b/doc/cache-sim.html
index 0b45367d2..66494936c 100644
--- a/doc/cache-sim.html
+++ b/doc/cache-sim.html
@@ -37,7 +37,7 @@ <h1>Syntax highlighting cache simulator</h1>
 </div>
 
 <script>
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/docs/css/main.scss b/docs/css/main.scss
index b0b6627fd..c6ced67f0 100755
--- a/docs/css/main.scss
+++ b/docs/css/main.scss
@@ -46,7 +46,7 @@ $on-laptop: 800px;
 @import "syntax-highlighting";
 
 /**
- * Copyright 2015 Google Inc. All Rights Reserved.
+ * Copyright 2015 The xi-editor Authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/python/bracket_example.py b/python/bracket_example.py
index 1a78b0f23..4fda22f1b 100755
--- a/python/bracket_example.py
+++ b/python/bracket_example.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/echo_plugin.py b/python/echo_plugin.py
index 2639806c0..fe98bef2a 100755
--- a/python/echo_plugin.py
+++ b/python/echo_plugin.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/shouty.py b/python/shouty.py
index f0487c6eb..1ae78f8c6 100755
--- a/python/shouty.py
+++ b/python/shouty.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/spellcheck.py b/python/spellcheck.py
index b411a93fa..2334f98d7 100755
--- a/python/spellcheck.py
+++ b/python/spellcheck.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/xi_plugin/__init__.py b/python/xi_plugin/__init__.py
index b2febeae7..ee8b27638 100644
--- a/python/xi_plugin/__init__.py
+++ b/python/xi_plugin/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/xi_plugin/cache.py b/python/xi_plugin/cache.py
index c289a0241..e58123e43 100644
--- a/python/xi_plugin/cache.py
+++ b/python/xi_plugin/cache.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/xi_plugin/edit.py b/python/xi_plugin/edit.py
index 34feca39a..d889df0a5 100644
--- a/python/xi_plugin/edit.py
+++ b/python/xi_plugin/edit.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/xi_plugin/host.py b/python/xi_plugin/host.py
index 184f592b7..4391f76a2 100644
--- a/python/xi_plugin/host.py
+++ b/python/xi_plugin/host.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/xi_plugin/plugin.py b/python/xi_plugin/plugin.py
index 12afbabf3..62a108068 100644
--- a/python/xi_plugin/plugin.py
+++ b/python/xi_plugin/plugin.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/xi_plugin/rpc.py b/python/xi_plugin/rpc.py
index dcbd0b59e..4d1c7f273 100644
--- a/python/xi_plugin/rpc.py
+++ b/python/xi_plugin/rpc.py
@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/xi_plugin/style.py b/python/xi_plugin/style.py
index 2136ff93d..9ee2f0a7e 100644
--- a/python/xi_plugin/style.py
+++ b/python/xi_plugin/style.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/python/xi_plugin/view.py b/python/xi_plugin/view.py
index 060a23ad6..d16e8c715 100644
--- a/python/xi_plugin/view.py
+++ b/python/xi_plugin/view.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Google Inc. All rights reserved.
+# Copyright 2017 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/client.rs b/rust/core-lib/src/client.rs
index 46bc40df4..ab40964c5 100644
--- a/rust/core-lib/src/client.rs
+++ b/rust/core-lib/src/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/config.rs b/rust/core-lib/src/config.rs
index 58cd59e17..559ac528d 100644
--- a/rust/core-lib/src/config.rs
+++ b/rust/core-lib/src/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/core.rs b/rust/core-lib/src/core.rs
index 6fb19d7d2..d69f2ce07 100644
--- a/rust/core-lib/src/core.rs
+++ b/rust/core-lib/src/core.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/edit_types.rs b/rust/core-lib/src/edit_types.rs
index b8293c913..ab2bb00bc 100644
--- a/rust/core-lib/src/edit_types.rs
+++ b/rust/core-lib/src/edit_types.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/editor.rs b/rust/core-lib/src/editor.rs
index 7c8470ad6..f80e251df 100644
--- a/rust/core-lib/src/editor.rs
+++ b/rust/core-lib/src/editor.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/event_context.rs b/rust/core-lib/src/event_context.rs
index 18343c1e2..a8f83f03a 100644
--- a/rust/core-lib/src/event_context.rs
+++ b/rust/core-lib/src/event_context.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/file.rs b/rust/core-lib/src/file.rs
index ebfe33989..3ff7b57dd 100644
--- a/rust/core-lib/src/file.rs
+++ b/rust/core-lib/src/file.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/find.rs b/rust/core-lib/src/find.rs
index 63089c3cf..c47fe392f 100644
--- a/rust/core-lib/src/find.rs
+++ b/rust/core-lib/src/find.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/fuchsia/ledger.rs b/rust/core-lib/src/fuchsia/ledger.rs
index cd63dc43c..c57ebd433 100644
--- a/rust/core-lib/src/fuchsia/ledger.rs
+++ b/rust/core-lib/src/fuchsia/ledger.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/fuchsia/mod.rs b/rust/core-lib/src/fuchsia/mod.rs
index ce7f4ac1a..d2022aa1f 100644
--- a/rust/core-lib/src/fuchsia/mod.rs
+++ b/rust/core-lib/src/fuchsia/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/fuchsia/sync.rs b/rust/core-lib/src/fuchsia/sync.rs
index b66a23d8d..ff5099f68 100644
--- a/rust/core-lib/src/fuchsia/sync.rs
+++ b/rust/core-lib/src/fuchsia/sync.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/index_set.rs b/rust/core-lib/src/index_set.rs
index b63e34921..924b56184 100644
--- a/rust/core-lib/src/index_set.rs
+++ b/rust/core-lib/src/index_set.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/layers.rs b/rust/core-lib/src/layers.rs
index 55213a8f7..4567f5c2a 100644
--- a/rust/core-lib/src/layers.rs
+++ b/rust/core-lib/src/layers.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/lib.rs b/rust/core-lib/src/lib.rs
index 5a8a23e8c..71ab54c9d 100644
--- a/rust/core-lib/src/lib.rs
+++ b/rust/core-lib/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/line_cache_shadow.rs b/rust/core-lib/src/line_cache_shadow.rs
index 1886afe1c..db9fd3691 100644
--- a/rust/core-lib/src/line_cache_shadow.rs
+++ b/rust/core-lib/src/line_cache_shadow.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/linewrap.rs b/rust/core-lib/src/linewrap.rs
index 5391d48c5..ba768e01e 100644
--- a/rust/core-lib/src/linewrap.rs
+++ b/rust/core-lib/src/linewrap.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/movement.rs b/rust/core-lib/src/movement.rs
index 7eaf991af..c18421664 100644
--- a/rust/core-lib/src/movement.rs
+++ b/rust/core-lib/src/movement.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/plugins/catalog.rs b/rust/core-lib/src/plugins/catalog.rs
index f2aa2ab6d..963501d45 100644
--- a/rust/core-lib/src/plugins/catalog.rs
+++ b/rust/core-lib/src/plugins/catalog.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/plugins/manager.rs b/rust/core-lib/src/plugins/manager.rs
index 00f4f1595..ac45e0315 100644
--- a/rust/core-lib/src/plugins/manager.rs
+++ b/rust/core-lib/src/plugins/manager.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/plugins/manifest.rs b/rust/core-lib/src/plugins/manifest.rs
index d2c0d0427..d94e845a5 100644
--- a/rust/core-lib/src/plugins/manifest.rs
+++ b/rust/core-lib/src/plugins/manifest.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/plugins/mod.rs b/rust/core-lib/src/plugins/mod.rs
index 9a8888954..b265e8fa0 100644
--- a/rust/core-lib/src/plugins/mod.rs
+++ b/rust/core-lib/src/plugins/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/plugins/rpc.rs b/rust/core-lib/src/plugins/rpc.rs
index 410596731..26e51925d 100644
--- a/rust/core-lib/src/plugins/rpc.rs
+++ b/rust/core-lib/src/plugins/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/rpc.rs b/rust/core-lib/src/rpc.rs
index c755349ac..5b1029103 100644
--- a/rust/core-lib/src/rpc.rs
+++ b/rust/core-lib/src/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/selection.rs b/rust/core-lib/src/selection.rs
index 62d3b84a6..607bc0bd8 100644
--- a/rust/core-lib/src/selection.rs
+++ b/rust/core-lib/src/selection.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/styles.rs b/rust/core-lib/src/styles.rs
index a32914887..ba6b8aa0c 100644
--- a/rust/core-lib/src/styles.rs
+++ b/rust/core-lib/src/styles.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/syntax.rs b/rust/core-lib/src/syntax.rs
index 5c0b340a3..9d24fa333 100644
--- a/rust/core-lib/src/syntax.rs
+++ b/rust/core-lib/src/syntax.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/tabs.rs b/rust/core-lib/src/tabs.rs
index 5ddec3ad1..8f085d405 100644
--- a/rust/core-lib/src/tabs.rs
+++ b/rust/core-lib/src/tabs.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/view.rs b/rust/core-lib/src/view.rs
index d51a12e26..b115eb4f7 100644
--- a/rust/core-lib/src/view.rs
+++ b/rust/core-lib/src/view.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/watcher.rs b/rust/core-lib/src/watcher.rs
index 69419a875..41ef3e9df 100644
--- a/rust/core-lib/src/watcher.rs
+++ b/rust/core-lib/src/watcher.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/width_cache.rs b/rust/core-lib/src/width_cache.rs
index 8ce2546fe..1859ac3c0 100644
--- a/rust/core-lib/src/width_cache.rs
+++ b/rust/core-lib/src/width_cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/src/word_boundaries.rs b/rust/core-lib/src/word_boundaries.rs
index 1875901c6..2e3430a82 100644
--- a/rust/core-lib/src/word_boundaries.rs
+++ b/rust/core-lib/src/word_boundaries.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/core-lib/tests/rpc.rs b/rust/core-lib/tests/rpc.rs
index 87ef961b7..b1b6e725b 100644
--- a/rust/core-lib/tests/rpc.rs
+++ b/rust/core-lib/tests/rpc.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/experimental/lang/benches/peg_tests.rs b/rust/experimental/lang/benches/peg_tests.rs
index 19fd66025..12691b2bb 100644
--- a/rust/experimental/lang/benches/peg_tests.rs
+++ b/rust/experimental/lang/benches/peg_tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/experimental/lang/src/colorize.rs b/rust/experimental/lang/src/colorize.rs
index cb88a690c..1d5db3d12 100644
--- a/rust/experimental/lang/src/colorize.rs
+++ b/rust/experimental/lang/src/colorize.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/experimental/lang/src/lib.rs b/rust/experimental/lang/src/lib.rs
index 0f285feaf..4c1f64e2e 100644
--- a/rust/experimental/lang/src/lib.rs
+++ b/rust/experimental/lang/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/experimental/lang/src/main.rs b/rust/experimental/lang/src/main.rs
index acc86256e..ce8364c38 100644
--- a/rust/experimental/lang/src/main.rs
+++ b/rust/experimental/lang/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/experimental/lang/src/peg.rs b/rust/experimental/lang/src/peg.rs
index fa79ba427..45c00a04d 100644
--- a/rust/experimental/lang/src/peg.rs
+++ b/rust/experimental/lang/src/peg.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/experimental/lang/src/rust.rs b/rust/experimental/lang/src/rust.rs
index f1dd3e932..e7537663f 100644
--- a/rust/experimental/lang/src/rust.rs
+++ b/rust/experimental/lang/src/rust.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/experimental/lang/src/statestack.rs b/rust/experimental/lang/src/statestack.rs
index 7dff5ad5d..b01792701 100644
--- a/rust/experimental/lang/src/statestack.rs
+++ b/rust/experimental/lang/src/statestack.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/bin/xi-lsp-plugin.rs b/rust/lsp-lib/src/bin/xi-lsp-plugin.rs
index 6097e1a5c..d32a560fa 100644
--- a/rust/lsp-lib/src/bin/xi-lsp-plugin.rs
+++ b/rust/lsp-lib/src/bin/xi-lsp-plugin.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/conversion_utils.rs b/rust/lsp-lib/src/conversion_utils.rs
index 4d039ab3b..4487c2bb9 100644
--- a/rust/lsp-lib/src/conversion_utils.rs
+++ b/rust/lsp-lib/src/conversion_utils.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/language_server_client.rs b/rust/lsp-lib/src/language_server_client.rs
index 2662c8816..ca669bc12 100644
--- a/rust/lsp-lib/src/language_server_client.rs
+++ b/rust/lsp-lib/src/language_server_client.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/lib.rs b/rust/lsp-lib/src/lib.rs
index 69b5ccf57..67910da1b 100644
--- a/rust/lsp-lib/src/lib.rs
+++ b/rust/lsp-lib/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/lsp_plugin.rs b/rust/lsp-lib/src/lsp_plugin.rs
index 37fa7c01a..0a05e3d7b 100644
--- a/rust/lsp-lib/src/lsp_plugin.rs
+++ b/rust/lsp-lib/src/lsp_plugin.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/parse_helper.rs b/rust/lsp-lib/src/parse_helper.rs
index 9608a7bbf..ac9910692 100644
--- a/rust/lsp-lib/src/parse_helper.rs
+++ b/rust/lsp-lib/src/parse_helper.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/result_queue.rs b/rust/lsp-lib/src/result_queue.rs
index dcc5dc7c9..432aef367 100644
--- a/rust/lsp-lib/src/result_queue.rs
+++ b/rust/lsp-lib/src/result_queue.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/types.rs b/rust/lsp-lib/src/types.rs
index ee252107e..925711410 100644
--- a/rust/lsp-lib/src/types.rs
+++ b/rust/lsp-lib/src/types.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/lsp-lib/src/utils.rs b/rust/lsp-lib/src/utils.rs
index fbbd1528a..0c2fbdd31 100644
--- a/rust/lsp-lib/src/utils.rs
+++ b/rust/lsp-lib/src/utils.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/plugin-lib/src/base_cache.rs b/rust/plugin-lib/src/base_cache.rs
index 574bc67e8..bcf264bb0 100644
--- a/rust/plugin-lib/src/base_cache.rs
+++ b/rust/plugin-lib/src/base_cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/plugin-lib/src/core_proxy.rs b/rust/plugin-lib/src/core_proxy.rs
index 229b4c38b..4f3e2954c 100644
--- a/rust/plugin-lib/src/core_proxy.rs
+++ b/rust/plugin-lib/src/core_proxy.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/plugin-lib/src/dispatch.rs b/rust/plugin-lib/src/dispatch.rs
index a90825a27..aed214388 100644
--- a/rust/plugin-lib/src/dispatch.rs
+++ b/rust/plugin-lib/src/dispatch.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/plugin-lib/src/lib.rs b/rust/plugin-lib/src/lib.rs
index 9e31111d3..4cd0dae2f 100644
--- a/rust/plugin-lib/src/lib.rs
+++ b/rust/plugin-lib/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/plugin-lib/src/state_cache.rs b/rust/plugin-lib/src/state_cache.rs
index 94dfc94b8..a5a74053a 100644
--- a/rust/plugin-lib/src/state_cache.rs
+++ b/rust/plugin-lib/src/state_cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/plugin-lib/src/view.rs b/rust/plugin-lib/src/view.rs
index cd6502fb7..938aa1448 100644
--- a/rust/plugin-lib/src/view.rs
+++ b/rust/plugin-lib/src/view.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google Inc. All rights reserved.
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/benches/cursors.rs b/rust/rope/benches/cursors.rs
index 129462089..8a583b9b4 100644
--- a/rust/rope/benches/cursors.rs
+++ b/rust/rope/benches/cursors.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/examples/ropetoy.rs b/rust/rope/examples/ropetoy.rs
index e0002cf04..580464068 100644
--- a/rust/rope/examples/ropetoy.rs
+++ b/rust/rope/examples/ropetoy.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/breaks.rs b/rust/rope/src/breaks.rs
index 70ab7a1a2..701f2b7ba 100644
--- a/rust/rope/src/breaks.rs
+++ b/rust/rope/src/breaks.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/delta.rs b/rust/rope/src/delta.rs
index 7536fe44a..591c164fe 100644
--- a/rust/rope/src/delta.rs
+++ b/rust/rope/src/delta.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/engine.rs b/rust/rope/src/engine.rs
index b6ea7ac83..cef20c7cd 100644
--- a/rust/rope/src/engine.rs
+++ b/rust/rope/src/engine.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/find.rs b/rust/rope/src/find.rs
index df62dd319..be22a1555 100644
--- a/rust/rope/src/find.rs
+++ b/rust/rope/src/find.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/interval.rs b/rust/rope/src/interval.rs
index 3de323062..8f97b988b 100644
--- a/rust/rope/src/interval.rs
+++ b/rust/rope/src/interval.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/lib.rs b/rust/rope/src/lib.rs
index f3a20722a..984b1a455 100644
--- a/rust/rope/src/lib.rs
+++ b/rust/rope/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/multiset.rs b/rust/rope/src/multiset.rs
index e6689073b..378614a81 100644
--- a/rust/rope/src/multiset.rs
+++ b/rust/rope/src/multiset.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/rope.rs b/rust/rope/src/rope.rs
index 21d641047..f51905f29 100644
--- a/rust/rope/src/rope.rs
+++ b/rust/rope/src/rope.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/spans.rs b/rust/rope/src/spans.rs
index 45657e6c8..68b6ea523 100644
--- a/rust/rope/src/spans.rs
+++ b/rust/rope/src/spans.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/test_helpers.rs b/rust/rope/src/test_helpers.rs
index 3cdb07e7f..bec51abae 100644
--- a/rust/rope/src/test_helpers.rs
+++ b/rust/rope/src/test_helpers.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rope/src/tree.rs b/rust/rope/src/tree.rs
index e57ce521b..e27270e57 100644
--- a/rust/rope/src/tree.rs
+++ b/rust/rope/src/tree.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rpc/examples/try_chan.rs b/rust/rpc/examples/try_chan.rs
index 256c65a47..67c17219c 100644
--- a/rust/rpc/examples/try_chan.rs
+++ b/rust/rpc/examples/try_chan.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rpc/src/error.rs b/rust/rpc/src/error.rs
index bb9a3b9fb..21fe2e641 100644
--- a/rust/rpc/src/error.rs
+++ b/rust/rpc/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rpc/src/lib.rs b/rust/rpc/src/lib.rs
index 6eb35b957..8c7f0f018 100644
--- a/rust/rpc/src/lib.rs
+++ b/rust/rpc/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rpc/src/parse.rs b/rust/rpc/src/parse.rs
index f09298556..d718cb4cb 100644
--- a/rust/rpc/src/parse.rs
+++ b/rust/rpc/src/parse.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rpc/src/test_utils.rs b/rust/rpc/src/test_utils.rs
index ecd0cbee0..1acd4775b 100644
--- a/rust/rpc/src/test_utils.rs
+++ b/rust/rpc/src/test_utils.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/rpc/tests/integration.rs b/rust/rpc/tests/integration.rs
index 426ad822d..688fe4bb9 100644
--- a/rust/rpc/tests/integration.rs
+++ b/rust/rpc/tests/integration.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/sample-plugin/src/main.rs b/rust/sample-plugin/src/main.rs
index b832c96e3..87cfc9631 100644
--- a/rust/sample-plugin/src/main.rs
+++ b/rust/sample-plugin/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/src/main.rs b/rust/src/main.rs
index c2424515c..e5c7c3244 100644
--- a/rust/src/main.rs
+++ b/rust/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/syntect-plugin/examples/make_manifest.rs b/rust/syntect-plugin/examples/make_manifest.rs
index 45a6332e5..b73d516a8 100644
--- a/rust/syntect-plugin/examples/make_manifest.rs
+++ b/rust/syntect-plugin/examples/make_manifest.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/syntect-plugin/src/main.rs b/rust/syntect-plugin/src/main.rs
index f3d4897f1..d84e6402b 100644
--- a/rust/syntect-plugin/src/main.rs
+++ b/rust/syntect-plugin/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/syntect-plugin/src/stackmap.rs b/rust/syntect-plugin/src/stackmap.rs
index 59f67c872..325478ea4 100644
--- a/rust/syntect-plugin/src/stackmap.rs
+++ b/rust/syntect-plugin/src/stackmap.rs
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All rights reserved.
+// Copyright 2017 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/trace-dump/src/chrome_trace.rs b/rust/trace-dump/src/chrome_trace.rs
index f03e0ae55..a532111b1 100644
--- a/rust/trace-dump/src/chrome_trace.rs
+++ b/rust/trace-dump/src/chrome_trace.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/trace-dump/src/lib.rs b/rust/trace-dump/src/lib.rs
index 934a89deb..9092769d6 100644
--- a/rust/trace-dump/src/lib.rs
+++ b/rust/trace-dump/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/trace/src/fixed_lifo_deque.rs b/rust/trace/src/fixed_lifo_deque.rs
index 54d39e589..470419846 100644
--- a/rust/trace/src/fixed_lifo_deque.rs
+++ b/rust/trace/src/fixed_lifo_deque.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/trace/src/lib.rs b/rust/trace/src/lib.rs
index 47c4d4c1c..ce6460f1c 100644
--- a/rust/trace/src/lib.rs
+++ b/rust/trace/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/trace/src/sys_pid.rs b/rust/trace/src/sys_pid.rs
index 445392fe0..807e0630e 100644
--- a/rust/trace/src/sys_pid.rs
+++ b/rust/trace/src/sys_pid.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/trace/src/sys_tid.rs b/rust/trace/src/sys_tid.rs
index 28123968d..5acfec33c 100644
--- a/rust/trace/src/sys_tid.rs
+++ b/rust/trace/src/sys_tid.rs
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/unicode/benches/bench.rs b/rust/unicode/benches/bench.rs
index 602c0302b..bfbdb981c 100644
--- a/rust/unicode/benches/bench.rs
+++ b/rust/unicode/benches/bench.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/unicode/examples/runtestdata.rs b/rust/unicode/examples/runtestdata.rs
index 52021cf2c..7a1ffdac6 100644
--- a/rust/unicode/examples/runtestdata.rs
+++ b/rust/unicode/examples/runtestdata.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/unicode/src/lib.rs b/rust/unicode/src/lib.rs
index c01abd5a6..08a880975 100644
--- a/rust/unicode/src/lib.rs
+++ b/rust/unicode/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/unicode/src/tables.rs b/rust/unicode/src/tables.rs
index e04247c8d..1620a5042 100644
--- a/rust/unicode/src/tables.rs
+++ b/rust/unicode/src/tables.rs
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/unicode/tools/gen_rand_icu.cc b/rust/unicode/tools/gen_rand_icu.cc
index ae160af47..df0d600bb 100755
--- a/rust/unicode/tools/gen_rand_icu.cc
+++ b/rust/unicode/tools/gen_rand_icu.cc
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All rights reserved.
+// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/rust/unicode/tools/mk_tables.py b/rust/unicode/tools/mk_tables.py
index 1fbed707f..f341279df 100644
--- a/rust/unicode/tools/mk_tables.py
+++ b/rust/unicode/tools/mk_tables.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright 2016 Google Inc. All rights reserved.
+# Copyright 2016 The xi-editor Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -104,7 +104,7 @@ def mk_linebreak_props(datadir):
     gen_table('LINEBREAK_4_LEAVES', 'u8', leaves4);
 
 def mk_tables(datadir):
-    print """// Copyright 2016 Google Inc. All rights reserved.
+    print """// Copyright 2016 The xi-editor Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.