diff --git a/Cargo.toml b/Cargo.toml
index ebdb76256..541dc1d78 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,12 @@
 [package]
 name = "prost"
 version = "0.7.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 license = "Apache-2.0"
-repository = "https://github.com/danburkert/prost"
+repository = "https://github.com/tokio-rs/prost"
 documentation = "https://docs.rs/prost"
 readme = "README.md"
 description = "A Protocol Buffers implementation for the Rust Language."
diff --git a/README.md b/README.md
index c99219d31..91a6921ee 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-![continuous integration](https://github.com/danburkert/prost/workflows/continuous%20integration/badge.svg)
+![continuous integration](https://github.com/tokio-rs/prost/workflows/continuous%20integration/badge.svg)
 [![Documentation](https://docs.rs/prost/badge.svg)](https://docs.rs/prost/)
 [![Crate](https://img.shields.io/crates/v/prost.svg)](https://crates.io/crates/prost)
-[![Dependency Status](https://deps.rs/repo/github/danburkert/prost/status.svg)](https://deps.rs/repo/github/danburkert/prost)
+[![Dependency Status](https://deps.rs/repo/github/tokio-rs/prost/status.svg)](https://deps.rs/repo/github/tokio-rs/prost)
 
 # *PROST!*
 
diff --git a/conformance/Cargo.toml b/conformance/Cargo.toml
index efa8be835..83249f173 100644
--- a/conformance/Cargo.toml
+++ b/conformance/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "conformance"
 version = "0.0.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 publish = false
 edition = "2018"
 
diff --git a/conformance/failing_tests.txt b/conformance/failing_tests.txt
index 73f00caa6..b41904761 100644
--- a/conformance/failing_tests.txt
+++ b/conformance/failing_tests.txt
@@ -1,3 +1,3 @@
-# TODO(danburkert/prost#2): prost doesn't preserve unknown fields.
+# TODO(tokio-rs/prost#2): prost doesn't preserve unknown fields.
 Required.Proto2.ProtobufInput.UnknownVarint.ProtobufOutput
 Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index 5a1f425c3..faedb3a2d 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "fuzz"
 version = "0.0.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 publish = false
 edition = "2018"
 
diff --git a/prost-build/Cargo.toml b/prost-build/Cargo.toml
index 536e316f6..937965249 100644
--- a/prost-build/Cargo.toml
+++ b/prost-build/Cargo.toml
@@ -1,9 +1,12 @@
 [package]
 name = "prost-build"
 version = "0.7.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 license = "Apache-2.0"
-repository = "https://github.com/danburkert/prost"
+repository = "https://github.com/tokio-rs/prost"
 documentation = "https://docs.rs/prost-build"
 readme = "README.md"
 description = "A Protocol Buffers implementation for the Rust Language."
diff --git a/prost-derive/Cargo.toml b/prost-derive/Cargo.toml
index 0c0b747ec..a42bb1362 100644
--- a/prost-derive/Cargo.toml
+++ b/prost-derive/Cargo.toml
@@ -1,9 +1,12 @@
 [package]
 name = "prost-derive"
 version = "0.7.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 license = "Apache-2.0"
-repository = "https://github.com/danburkert/prost"
+repository = "https://github.com/tokio-rs/prost"
 documentation = "https://docs.rs/prost-derive"
 readme = "README.md"
 description = "A Protocol Buffers implementation for the Rust Language."
diff --git a/prost-types/Cargo.toml b/prost-types/Cargo.toml
index c531cf28b..e90c78ba6 100644
--- a/prost-types/Cargo.toml
+++ b/prost-types/Cargo.toml
@@ -1,9 +1,12 @@
 [package]
 name = "prost-types"
 version = "0.7.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 license = "Apache-2.0"
-repository = "https://github.com/danburkert/prost"
+repository = "https://github.com/tokio-rs/prost"
 documentation = "https://docs.rs/prost-types"
 readme = "README.md"
 description = "A Protocol Buffers implementation for the Rust Language."
diff --git a/protobuf/Cargo.toml b/protobuf/Cargo.toml
index 824a8cd9b..a687bcd3b 100644
--- a/protobuf/Cargo.toml
+++ b/protobuf/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "protobuf"
 version = "0.0.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 publish = false
 edition = "2018"
 
diff --git a/tests-2015/Cargo.toml b/tests-2015/Cargo.toml
index efb56abdf..585d530ff 100644
--- a/tests-2015/Cargo.toml
+++ b/tests-2015/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "tests-2015"
 version = "0.0.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 publish = false
 edition = "2015"
 
diff --git a/tests-no-std/Cargo.toml b/tests-no-std/Cargo.toml
index 1954d281c..005c5841b 100644
--- a/tests-no-std/Cargo.toml
+++ b/tests-no-std/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "tests-no-std"
 version = "0.0.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 publish = false
 edition = "2018"
 
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 726a59137..e544dc812 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "tests"
 version = "0.0.0"
-authors = ["Dan Burkert <dan@danburkert.com>"]
+authors = [
+    "Dan Burkert <dan@danburkert.com>",
+    "Tokio Contributors <team@tokio.rs>",
+]
 publish = false
 edition = "2018"
 
diff --git a/tests/src/debug.rs b/tests/src/debug.rs
index 3873cdcc7..ae5729f8e 100644
--- a/tests/src/debug.rs
+++ b/tests/src/debug.rs
@@ -52,7 +52,7 @@ fn basic() {
 }
 
 /*
-TODO(danburkert/prost#56):
+TODO(tokio-rs/prost#56):
 
 /// A special case with a tuple struct
 #[test]
diff --git a/tests/src/default_enum_value.proto b/tests/src/default_enum_value.proto
index 749d5764e..667cc3dc9 100644
--- a/tests/src/default_enum_value.proto
+++ b/tests/src/default_enum_value.proto
@@ -17,7 +17,7 @@ message Test {
   optional PrivacyLevel privacy_level_4 = 3 [default = PRIVACY_LEVELPRIVACY_LEVEL_FOUR];
 }
 
-// danburkert/prost#310
+// tokio-rs/prost#310
 enum ERemoteClientBroadcastMsg {
     k_ERemoteClientBroadcastMsgDiscovery = 0;
 }
diff --git a/tests/src/lib.rs b/tests/src/lib.rs
index f56d73e7a..4b13ed583 100644
--- a/tests/src/lib.rs
+++ b/tests/src/lib.rs
@@ -77,7 +77,7 @@ pub mod oneof_attributes {
     include!(concat!(env!("OUT_DIR"), "/foo.custom.one_of_attrs.rs"));
 }
 
-/// Issue https://github.com/danburkert/prost/issues/118
+/// Issue https://github.com/tokio-rs/prost/issues/118
 ///
 /// When a message contains an enum field with a default value, we
 /// must ensure that the appropriate name conventions are used.
@@ -499,7 +499,7 @@ mod tests {
         // Checks that skip_field will error appropriately when given a big stack of StartGroup
         // tags. When the no-recursion-limit feature is enabled this results in stack overflow.
         //
-        // https://github.com/danburkert/prost/issues/267
+        // https://github.com/tokio-rs/prost/issues/267
         let buf = vec![b'C'; 1 << 20];
         <() as Message>::decode(&buf[..]).err().unwrap();
     }