Repository: swimos/swim-rust (language: rust)

Issue:
Update copyright to Swim Inc



Discussion / hints:

Fix patch:
diff --git a/LICENSE b/LICENSE
index f5ef7e918..f12c2f9c0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2021 SWIM.AI inc.
+   Copyright 2021 Swim Inc.
 
    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/api/formats/swim_msgpack/Cargo.toml b/api/formats/swim_msgpack/Cargo.toml
index 8ca4b14ec..fc13dba69 100644
--- a/api/formats/swim_msgpack/Cargo.toml
+++ b/api/formats/swim_msgpack/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_msgpack"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/api/formats/swim_msgpack/src/lib.rs b/api/formats/swim_msgpack/src/lib.rs
index 10c68103a..752cebe05 100644
--- a/api/formats/swim_msgpack/src/lib.rs
+++ b/api/formats/swim_msgpack/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_msgpack/src/reader/mod.rs b/api/formats/swim_msgpack/src/reader/mod.rs
index 515c80ca0..066524e73 100644
--- a/api/formats/swim_msgpack/src/reader/mod.rs
+++ b/api/formats/swim_msgpack/src/reader/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_msgpack/src/writer/mod.rs b/api/formats/swim_msgpack/src/writer/mod.rs
index 83f2270cf..b242d40ae 100644
--- a/api/formats/swim_msgpack/src/writer/mod.rs
+++ b/api/formats/swim_msgpack/src/writer/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/Cargo.toml b/api/formats/swim_recon/Cargo.toml
index e9ae0d778..9f2dbc7f7 100644
--- a/api/formats/swim_recon/Cargo.toml
+++ b/api/formats/swim_recon/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_recon"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [features]
diff --git a/api/formats/swim_recon/src/lib.rs b/api/formats/swim_recon/src/lib.rs
index 783285f2a..2e0e99d27 100644
--- a/api/formats/swim_recon/src/lib.rs
+++ b/api/formats/swim_recon/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/parser/async_parser/mod.rs b/api/formats/swim_recon/src/parser/async_parser/mod.rs
index a7c328f90..437cc8240 100644
--- a/api/formats/swim_recon/src/parser/async_parser/mod.rs
+++ b/api/formats/swim_recon/src/parser/async_parser/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/parser/error.rs b/api/formats/swim_recon/src/parser/error.rs
index 480581999..3da671037 100644
--- a/api/formats/swim_recon/src/parser/error.rs
+++ b/api/formats/swim_recon/src/parser/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/parser/mod.rs b/api/formats/swim_recon/src/parser/mod.rs
index aea2cb6f6..34a15d660 100644
--- a/api/formats/swim_recon/src/parser/mod.rs
+++ b/api/formats/swim_recon/src/parser/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/parser/record.rs b/api/formats/swim_recon/src/parser/record.rs
index 9dc6041bc..f8a9f9465 100644
--- a/api/formats/swim_recon/src/parser/record.rs
+++ b/api/formats/swim_recon/src/parser/record.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/parser/tokens.rs b/api/formats/swim_recon/src/parser/tokens.rs
index 8f8a5f4c3..f64bb4400 100644
--- a/api/formats/swim_recon/src/parser/tokens.rs
+++ b/api/formats/swim_recon/src/parser/tokens.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/printer/mod.rs b/api/formats/swim_recon/src/printer/mod.rs
index 76d8fb332..8275e0803 100644
--- a/api/formats/swim_recon/src/printer/mod.rs
+++ b/api/formats/swim_recon/src/printer/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/Cargo.toml b/api/swim_form/Cargo.toml
index a5c4997ea..39a69bc40 100644
--- a/api/swim_form/Cargo.toml
+++ b/api/swim_form/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_form"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/api/swim_form/src/lib.rs b/api/swim_form/src/lib.rs
index d27364bc4..10339e899 100644
--- a/api/swim_form/src/lib.rs
+++ b/api/swim_form/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/bridge/mod.rs b/api/swim_form/src/structural/bridge/mod.rs
index b7516f705..3fc687731 100644
--- a/api/swim_form/src/structural/bridge/mod.rs
+++ b/api/swim_form/src/structural/bridge/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/generic/coproduct.rs b/api/swim_form/src/structural/generic/coproduct.rs
index c3dc9244d..e4106ae24 100644
--- a/api/swim_form/src/structural/generic/coproduct.rs
+++ b/api/swim_form/src/structural/generic/coproduct.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/generic/header.rs b/api/swim_form/src/structural/generic/header.rs
index 1e94ba5a8..3b57ce5ae 100644
--- a/api/swim_form/src/structural/generic/header.rs
+++ b/api/swim_form/src/structural/generic/header.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/generic/mod.rs b/api/swim_form/src/structural/generic/mod.rs
index ebf0435be..ff6e0daa5 100644
--- a/api/swim_form/src/structural/generic/mod.rs
+++ b/api/swim_form/src/structural/generic/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/mod.rs b/api/swim_form/src/structural/mod.rs
index 6783e3d03..8c2f03544 100644
--- a/api/swim_form/src/structural/mod.rs
+++ b/api/swim_form/src/structural/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/error.rs b/api/swim_form/src/structural/read/error.rs
index bee001a9b..9653f876c 100644
--- a/api/swim_form/src/structural/read/error.rs
+++ b/api/swim_form/src/structural/read/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/event.rs b/api/swim_form/src/structural/read/event.rs
index 36ce40c20..9cd6bc8fe 100644
--- a/api/swim_form/src/structural/read/event.rs
+++ b/api/swim_form/src/structural/read/event.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/from_model/mod.rs b/api/swim_form/src/structural/read/from_model/mod.rs
index 89a780509..6b3f79212 100644
--- a/api/swim_form/src/structural/read/from_model/mod.rs
+++ b/api/swim_form/src/structural/read/from_model/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/mod.rs b/api/swim_form/src/structural/read/mod.rs
index e8ef8efa4..a6d2b1ec0 100644
--- a/api/swim_form/src/structural/read/mod.rs
+++ b/api/swim_form/src/structural/read/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/recognizer/impls.rs b/api/swim_form/src/structural/read/recognizer/impls.rs
index 91b073aab..e51ba1c54 100644
--- a/api/swim_form/src/structural/read/recognizer/impls.rs
+++ b/api/swim_form/src/structural/read/recognizer/impls.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/recognizer/mod.rs b/api/swim_form/src/structural/read/recognizer/mod.rs
index 31db2606e..ddc8a1eba 100644
--- a/api/swim_form/src/structural/read/recognizer/mod.rs
+++ b/api/swim_form/src/structural/read/recognizer/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/recognizer/primitive/mod.rs b/api/swim_form/src/structural/read/recognizer/primitive/mod.rs
index 14f10c9d1..0d98b0c46 100644
--- a/api/swim_form/src/structural/read/recognizer/primitive/mod.rs
+++ b/api/swim_form/src/structural/read/recognizer/primitive/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/tags.rs b/api/swim_form/src/structural/tags.rs
index a4650d874..369b48a2c 100644
--- a/api/swim_form/src/structural/tags.rs
+++ b/api/swim_form/src/structural/tags.rs
@@ -1,3 +1,17 @@
+// Copyright 2015-2021 Swim Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 pub const IMMEDIATE_TAG: &str = "immediate";
 pub const INTERVAL_TAG: &str = "interval";
 pub const EXPONENTIAL_TAG: &str = "exponential";
diff --git a/api/swim_form/src/structural/write/impls.rs b/api/swim_form/src/structural/write/impls.rs
index 88c406942..5b0d65aaa 100644
--- a/api/swim_form/src/structural/write/impls.rs
+++ b/api/swim_form/src/structural/write/impls.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/write/mod.rs b/api/swim_form/src/structural/write/mod.rs
index 71901ebc4..b1d0b31c6 100644
--- a/api/swim_form/src/structural/write/mod.rs
+++ b/api/swim_form/src/structural/write/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/write/to_model/mod.rs b/api/swim_form/src/structural/write/to_model/mod.rs
index 8ae7bbeeb..195b572c0 100644
--- a/api/swim_form/src/structural/write/to_model/mod.rs
+++ b/api/swim_form/src/structural/write/to_model/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/Cargo.toml b/api/swim_form_derive/Cargo.toml
index b1bff28a7..31c5c0f82 100644
--- a/api/swim_form_derive/Cargo.toml
+++ b/api/swim_form_derive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_form_derive"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [lib]
diff --git a/api/swim_form_derive/src/form/from_value.rs b/api/swim_form_derive/src/form/from_value.rs
index e69de29bb..3ca67b81e 100644
--- a/api/swim_form_derive/src/form/from_value.rs
+++ b/api/swim_form_derive/src/form/from_value.rs
@@ -0,0 +1,13 @@
+// Copyright 2015-2021 Swim Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
diff --git a/api/swim_form_derive/src/lib.rs b/api/swim_form_derive/src/lib.rs
index ec33535c4..766c571c5 100644
--- a/api/swim_form_derive/src/lib.rs
+++ b/api/swim_form_derive/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/modifiers.rs b/api/swim_form_derive/src/modifiers.rs
index 8dc2b70cd..48b70769a 100644
--- a/api/swim_form_derive/src/modifiers.rs
+++ b/api/swim_form_derive/src/modifiers.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/structural/mod.rs b/api/swim_form_derive/src/structural/mod.rs
index 8a310631e..5468343e5 100644
--- a/api/swim_form_derive/src/structural/mod.rs
+++ b/api/swim_form_derive/src/structural/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/structural/model/enumeration/mod.rs b/api/swim_form_derive/src/structural/model/enumeration/mod.rs
index 5d0cf8594..b72931c8a 100644
--- a/api/swim_form_derive/src/structural/model/enumeration/mod.rs
+++ b/api/swim_form_derive/src/structural/model/enumeration/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/structural/model/field/mod.rs b/api/swim_form_derive/src/structural/model/field/mod.rs
index e7ba19f4d..8c3b0b3dc 100644
--- a/api/swim_form_derive/src/structural/model/field/mod.rs
+++ b/api/swim_form_derive/src/structural/model/field/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/structural/model/mod.rs b/api/swim_form_derive/src/structural/model/mod.rs
index 92f956d3d..6c865a469 100644
--- a/api/swim_form_derive/src/structural/model/mod.rs
+++ b/api/swim_form_derive/src/structural/model/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/structural/model/record/mod.rs b/api/swim_form_derive/src/structural/model/record/mod.rs
index ccd0fa890..dd6df4ae7 100644
--- a/api/swim_form_derive/src/structural/model/record/mod.rs
+++ b/api/swim_form_derive/src/structural/model/record/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/structural/read/mod.rs b/api/swim_form_derive/src/structural/read/mod.rs
index bf686961d..1a8e76da7 100644
--- a/api/swim_form_derive/src/structural/read/mod.rs
+++ b/api/swim_form_derive/src/structural/read/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/structural/write/mod.rs b/api/swim_form_derive/src/structural/write/mod.rs
index 97aa4ce69..7c687f94d 100644
--- a/api/swim_form_derive/src/structural/write/mod.rs
+++ b/api/swim_form_derive/src/structural/write/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form_derive/src/tag/mod.rs b/api/swim_form_derive/src/tag/mod.rs
index bca45df8e..77373b90b 100644
--- a/api/swim_form_derive/src/tag/mod.rs
+++ b/api/swim_form_derive/src/tag/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/Cargo.toml b/api/swim_model/Cargo.toml
index 9fb60e225..dc7a03d9c 100644
--- a/api/swim_model/Cargo.toml
+++ b/api/swim_model/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_model"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/api/swim_model/src/attr.rs b/api/swim_model/src/attr.rs
index 56bd0c971..f2d5592e9 100644
--- a/api/swim_model/src/attr.rs
+++ b/api/swim_model/src/attr.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/blob.rs b/api/swim_model/src/blob.rs
index 55c863184..3b35d40c9 100644
--- a/api/swim_model/src/blob.rs
+++ b/api/swim_model/src/blob.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/identifier.rs b/api/swim_model/src/identifier.rs
index af000bf97..310814b82 100644
--- a/api/swim_model/src/identifier.rs
+++ b/api/swim_model/src/identifier.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/item.rs b/api/swim_model/src/item.rs
index 84b3fcc56..f72f92f0b 100644
--- a/api/swim_model/src/item.rs
+++ b/api/swim_model/src/item.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/lib.rs b/api/swim_model/src/lib.rs
index ea1f09ec4..310eec085 100644
--- a/api/swim_model/src/lib.rs
+++ b/api/swim_model/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/macros.rs b/api/swim_model/src/macros.rs
index ff6023e00..f961af3a7 100644
--- a/api/swim_model/src/macros.rs
+++ b/api/swim_model/src/macros.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/num.rs b/api/swim_model/src/num.rs
index c93ee6f87..47a49e64d 100644
--- a/api/swim_model/src/num.rs
+++ b/api/swim_model/src/num.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/path/mod.rs b/api/swim_model/src/path/mod.rs
index aed02f38d..ba3c4acb5 100644
--- a/api/swim_model/src/path/mod.rs
+++ b/api/swim_model/src/path/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/text/mod.rs b/api/swim_model/src/text/mod.rs
index d7b132657..db4790591 100644
--- a/api/swim_model/src/text/mod.rs
+++ b/api/swim_model/src/text/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/time.rs b/api/swim_model/src/time.rs
index 7a38c2194..d6c412ef3 100644
--- a/api/swim_model/src/time.rs
+++ b/api/swim_model/src/time.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/value.rs b/api/swim_model/src/value.rs
index 48b5a8368..502631311 100644
--- a/api/swim_model/src/value.rs
+++ b/api/swim_model/src/value.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/Cargo.toml b/api/swim_schema/Cargo.toml
index 6e5005692..fe95d064c 100644
--- a/api/swim_schema/Cargo.toml
+++ b/api/swim_schema/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_schema"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/api/swim_schema/src/impls.rs b/api/swim_schema/src/impls.rs
index e3dff7969..df303f9ba 100644
--- a/api/swim_schema/src/impls.rs
+++ b/api/swim_schema/src/impls.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/lib.rs b/api/swim_schema/src/lib.rs
index af4ab74e5..b48a79d2e 100644
--- a/api/swim_schema/src/lib.rs
+++ b/api/swim_schema/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/attr.rs b/api/swim_schema/src/schema/attr.rs
index f4f817feb..e2cef97b8 100644
--- a/api/swim_schema/src/schema/attr.rs
+++ b/api/swim_schema/src/schema/attr.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/item.rs b/api/swim_schema/src/schema/item.rs
index dcf8deaf9..d929d9e16 100644
--- a/api/swim_schema/src/schema/item.rs
+++ b/api/swim_schema/src/schema/item.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/mod.rs b/api/swim_schema/src/schema/mod.rs
index 7b3a275e1..bc89eec58 100644
--- a/api/swim_schema/src/schema/mod.rs
+++ b/api/swim_schema/src/schema/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/range.rs b/api/swim_schema/src/schema/range.rs
index afbb43aa7..d90ccf7ef 100644
--- a/api/swim_schema/src/schema/range.rs
+++ b/api/swim_schema/src/schema/range.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/slot.rs b/api/swim_schema/src/schema/slot.rs
index 7c2bd4609..82d2a9bb5 100644
--- a/api/swim_schema/src/schema/slot.rs
+++ b/api/swim_schema/src/schema/slot.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/text.rs b/api/swim_schema/src/schema/text.rs
index 79201b970..8ce39c948 100644
--- a/api/swim_schema/src/schema/text.rs
+++ b/api/swim_schema/src/schema/text.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/value_schema.rs b/api/swim_schema/src/value_schema.rs
index 98502d16b..9e590ef7b 100644
--- a/api/swim_schema/src/value_schema.rs
+++ b/api/swim_schema/src/value_schema.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/Cargo.toml b/api/swim_schema_derive/Cargo.toml
index 70bd8ff34..52dc173e7 100644
--- a/api/swim_schema_derive/Cargo.toml
+++ b/api/swim_schema_derive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_schema_derive"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [lib]
diff --git a/api/swim_schema_derive/src/form/form_parser.rs b/api/swim_schema_derive/src/form/form_parser.rs
index a6eda5fa5..1791d3037 100644
--- a/api/swim_schema_derive/src/form/form_parser.rs
+++ b/api/swim_schema_derive/src/form/form_parser.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/src/form/mod.rs b/api/swim_schema_derive/src/form/mod.rs
index 7b6c2a54e..60be70fde 100644
--- a/api/swim_schema_derive/src/form/mod.rs
+++ b/api/swim_schema_derive/src/form/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/src/lib.rs b/api/swim_schema_derive/src/lib.rs
index 40f1f03cf..94105d9dd 100644
--- a/api/swim_schema_derive/src/lib.rs
+++ b/api/swim_schema_derive/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/src/parser.rs b/api/swim_schema_derive/src/parser.rs
index cd46acd94..8dbf07d17 100644
--- a/api/swim_schema_derive/src/parser.rs
+++ b/api/swim_schema_derive/src/parser.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/src/validated_form/attrs.rs b/api/swim_schema_derive/src/validated_form/attrs.rs
index 4d8779b67..3f7ceef77 100644
--- a/api/swim_schema_derive/src/validated_form/attrs.rs
+++ b/api/swim_schema_derive/src/validated_form/attrs.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/src/validated_form/meta_parse.rs b/api/swim_schema_derive/src/validated_form/meta_parse.rs
index 2a5528de7..a02b729a7 100644
--- a/api/swim_schema_derive/src/validated_form/meta_parse.rs
+++ b/api/swim_schema_derive/src/validated_form/meta_parse.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/src/validated_form/mod.rs b/api/swim_schema_derive/src/validated_form/mod.rs
index bcaa3125d..3e01b093d 100644
--- a/api/swim_schema_derive/src/validated_form/mod.rs
+++ b/api/swim_schema_derive/src/validated_form/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/src/validated_form/range.rs b/api/swim_schema_derive/src/validated_form/range.rs
index 63537dd29..5dc2c10df 100644
--- a/api/swim_schema_derive/src/validated_form/range.rs
+++ b/api/swim_schema_derive/src/validated_form/range.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema_derive/src/validated_form/vf_parser.rs b/api/swim_schema_derive/src/validated_form/vf_parser.rs
index 1f30221f0..20e295b0a 100644
--- a/api/swim_schema_derive/src/validated_form/vf_parser.rs
+++ b/api/swim_schema_derive/src/validated_form/vf_parser.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/command_lanes/Cargo.toml b/cookbook/command_lanes/Cargo.toml
index fc8c8228e..1942676d7 100644
--- a/cookbook/command_lanes/Cargo.toml
+++ b/cookbook/command_lanes/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "command_lanes"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/cookbook/command_lanes/src/bin/agents/mod.rs b/cookbook/command_lanes/src/bin/agents/mod.rs
index b22c5aa2f..c57e3c1c9 100644
--- a/cookbook/command_lanes/src/bin/agents/mod.rs
+++ b/cookbook/command_lanes/src/bin/agents/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/command_lanes/src/bin/client.rs b/cookbook/command_lanes/src/bin/client.rs
index 994d01790..e1a2b50e2 100644
--- a/cookbook/command_lanes/src/bin/client.rs
+++ b/cookbook/command_lanes/src/bin/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/command_lanes/src/bin/server.rs b/cookbook/command_lanes/src/bin/server.rs
index 936010544..c495e6a6c 100644
--- a/cookbook/command_lanes/src/bin/server.rs
+++ b/cookbook/command_lanes/src/bin/server.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/downlinks/Cargo.toml b/cookbook/downlinks/Cargo.toml
index d4ba88292..602b925d0 100644
--- a/cookbook/downlinks/Cargo.toml
+++ b/cookbook/downlinks/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "downlinks"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/cookbook/downlinks/src/bin/agents/listener_agent.rs b/cookbook/downlinks/src/bin/agents/listener_agent.rs
index b39525db4..3544be54e 100644
--- a/cookbook/downlinks/src/bin/agents/listener_agent.rs
+++ b/cookbook/downlinks/src/bin/agents/listener_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@ use swim_client::downlink::Event;
 use swim_client::interface::ClientContext;
 use swim_client::runtime::task;
 use swim_form::Form;
-use swim_model::{Item, Value};
 use swim_model::path::{Path, RelativePath};
+use swim_model::{Item, Value};
 use swim_server::agent::command_lifecycle;
 use swim_server::agent::lane::channels::update::StmRetryStrategy;
 use swim_server::agent::lane::lifecycle::LaneLifecycle;
diff --git a/cookbook/downlinks/src/bin/agents/mod.rs b/cookbook/downlinks/src/bin/agents/mod.rs
index 982850a62..a727f4756 100644
--- a/cookbook/downlinks/src/bin/agents/mod.rs
+++ b/cookbook/downlinks/src/bin/agents/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/downlinks/src/bin/agents/unit_agent.rs b/cookbook/downlinks/src/bin/agents/unit_agent.rs
index d7e2f30b1..790d77901 100644
--- a/cookbook/downlinks/src/bin/agents/unit_agent.rs
+++ b/cookbook/downlinks/src/bin/agents/unit_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/downlinks/src/bin/client.rs b/cookbook/downlinks/src/bin/client.rs
index f475ac670..46e625b00 100644
--- a/cookbook/downlinks/src/bin/client.rs
+++ b/cookbook/downlinks/src/bin/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/downlinks/src/bin/server.rs b/cookbook/downlinks/src/bin/server.rs
index d9adeb374..c32aa76f4 100644
--- a/cookbook/downlinks/src/bin/server.rs
+++ b/cookbook/downlinks/src/bin/server.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/join_map_lanes/Cargo.toml b/cookbook/join_map_lanes/Cargo.toml
index 1ae4dd50e..aaed62e4c 100644
--- a/cookbook/join_map_lanes/Cargo.toml
+++ b/cookbook/join_map_lanes/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "join_map_lanes"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/cookbook/join_map_lanes/src/bin/client.rs b/cookbook/join_map_lanes/src/bin/client.rs
index 25a07883f..28ca17505 100644
--- a/cookbook/join_map_lanes/src/bin/client.rs
+++ b/cookbook/join_map_lanes/src/bin/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/join_value_lanes/Cargo.toml b/cookbook/join_value_lanes/Cargo.toml
index e4430e914..4dea2f715 100644
--- a/cookbook/join_value_lanes/Cargo.toml
+++ b/cookbook/join_value_lanes/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "join_value_lanes"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/cookbook/join_value_lanes/src/bin/client.rs b/cookbook/join_value_lanes/src/bin/client.rs
index 588047892..f564c86bd 100644
--- a/cookbook/join_value_lanes/src/bin/client.rs
+++ b/cookbook/join_value_lanes/src/bin/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ use swim_client::downlink::typed::map::events::TypedViewWithEvent;
 use swim_client::downlink::typed::map::MapDownlinkReceiver;
 use swim_client::downlink::Event::Remote;
 use swim_client::interface::SwimClientBuilder;
-use swim_model::Value;
 use swim_model::path::AbsolutePath;
+use swim_model::Value;
 use tokio::{task, time};
 
 async fn did_update(map_recv: MapDownlinkReceiver<i32, bool>, default: bool) {
diff --git a/cookbook/map_lanes/Cargo.toml b/cookbook/map_lanes/Cargo.toml
index 9815c9f15..e973040b2 100644
--- a/cookbook/map_lanes/Cargo.toml
+++ b/cookbook/map_lanes/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "map_lanes"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/cookbook/map_lanes/src/bin/agents/mod.rs b/cookbook/map_lanes/src/bin/agents/mod.rs
index 9284ffc9f..b62da5bf7 100644
--- a/cookbook/map_lanes/src/bin/agents/mod.rs
+++ b/cookbook/map_lanes/src/bin/agents/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/map_lanes/src/bin/client.rs b/cookbook/map_lanes/src/bin/client.rs
index 5bd1efd9d..1640a21a5 100644
--- a/cookbook/map_lanes/src/bin/client.rs
+++ b/cookbook/map_lanes/src/bin/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/map_lanes/src/bin/server.rs b/cookbook/map_lanes/src/bin/server.rs
index 77b1dda9f..c43504caa 100644
--- a/cookbook/map_lanes/src/bin/server.rs
+++ b/cookbook/map_lanes/src/bin/server.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/timers/Cargo.toml b/cookbook/timers/Cargo.toml
index 12bfe2d03..0fc459e56 100644
--- a/cookbook/timers/Cargo.toml
+++ b/cookbook/timers/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "timers"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/cookbook/timers/src/bin/agents/mod.rs b/cookbook/timers/src/bin/agents/mod.rs
index d76d8ab2d..6d3617657 100644
--- a/cookbook/timers/src/bin/agents/mod.rs
+++ b/cookbook/timers/src/bin/agents/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/timers/src/bin/client.rs b/cookbook/timers/src/bin/client.rs
index 8acb0d9a6..9e313ef43 100644
--- a/cookbook/timers/src/bin/client.rs
+++ b/cookbook/timers/src/bin/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,8 @@
 
 use std::time::Duration;
 use swim_client::interface::SwimClientBuilder;
-use swim_model::Value;
 use swim_model::path::AbsolutePath;
+use swim_model::Value;
 use tokio::time;
 
 #[tokio::main]
diff --git a/cookbook/timers/src/bin/server.rs b/cookbook/timers/src/bin/server.rs
index c6f6cfeba..e07c50b51 100644
--- a/cookbook/timers/src/bin/server.rs
+++ b/cookbook/timers/src/bin/server.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/value_lanes/Cargo.toml b/cookbook/value_lanes/Cargo.toml
index 8d6a6f9e5..d26c73e27 100644
--- a/cookbook/value_lanes/Cargo.toml
+++ b/cookbook/value_lanes/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "value_lanes"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/cookbook/value_lanes/src/bin/agents/mod.rs b/cookbook/value_lanes/src/bin/agents/mod.rs
index 11cacad01..fc345963b 100644
--- a/cookbook/value_lanes/src/bin/agents/mod.rs
+++ b/cookbook/value_lanes/src/bin/agents/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/value_lanes/src/bin/client.rs b/cookbook/value_lanes/src/bin/client.rs
index 5b30483db..355edc76a 100644
--- a/cookbook/value_lanes/src/bin/client.rs
+++ b/cookbook/value_lanes/src/bin/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/value_lanes/src/bin/server.rs b/cookbook/value_lanes/src/bin/server.rs
index 7ed0c3b4b..8959dd907 100644
--- a/cookbook/value_lanes/src/bin/server.rs
+++ b/cookbook/value_lanes/src/bin/server.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/web_agents/Cargo.toml b/cookbook/web_agents/Cargo.toml
index 5a6da8c00..864e7a083 100644
--- a/cookbook/web_agents/Cargo.toml
+++ b/cookbook/web_agents/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "web_agents"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/cookbook/web_agents/src/bin/agents/mod.rs b/cookbook/web_agents/src/bin/agents/mod.rs
index 7678dd364..83556b62b 100644
--- a/cookbook/web_agents/src/bin/agents/mod.rs
+++ b/cookbook/web_agents/src/bin/agents/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/cookbook/web_agents/src/bin/server.rs b/cookbook/web_agents/src/bin/server.rs
index ef90182e2..f9d539a44 100644
--- a/cookbook/web_agents/src/bin/server.rs
+++ b/cookbook/web_agents/src/bin/server.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ use crate::agents::{UnitAgent, UnitAgentLifecycle};
 use futures::join;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::time::Duration;
-use swim_model::Value;
 use swim_model::path::{Path, RelativePath};
+use swim_model::Value;
 use swim_server::interface::SwimServerBuilder;
 use swim_server::RoutePattern;
 use tokio::time;
diff --git a/install-commit-hook.sh b/install-commit-hook.sh
index 3123f1ee4..31d03aa77 100644
--- a/install-commit-hook.sh
+++ b/install-commit-hook.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+# Copyright 2015-2021 Swim Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 cp "$DIR/pre-commit" "$DIR/.git/hooks"
 chmod +x "$DIR/.git/hooks/pre-commit"
\ No newline at end of file
diff --git a/macro_utilities/Cargo.toml b/macro_utilities/Cargo.toml
index 8aac68f54..37fd84390 100644
--- a/macro_utilities/Cargo.toml
+++ b/macro_utilities/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "macro_utilities"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/macro_utilities/src/form.rs b/macro_utilities/src/form.rs
index 5dd4c08a0..48da06348 100644
--- a/macro_utilities/src/form.rs
+++ b/macro_utilities/src/form.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/src/generics.rs b/macro_utilities/src/generics.rs
index 0baaa8725..9b49ca236 100644
--- a/macro_utilities/src/generics.rs
+++ b/macro_utilities/src/generics.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/src/label.rs b/macro_utilities/src/label.rs
index f0e536af5..37175623e 100644
--- a/macro_utilities/src/label.rs
+++ b/macro_utilities/src/label.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/src/lib.rs b/macro_utilities/src/lib.rs
index 8a5b7f375..3bf8b0c8b 100644
--- a/macro_utilities/src/lib.rs
+++ b/macro_utilities/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/src/utilities.rs b/macro_utilities/src/utilities.rs
index bd4268d7a..4d0b7d15a 100644
--- a/macro_utilities/src/utilities.rs
+++ b/macro_utilities/src/utilities.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/Cargo.toml b/macro_utilities/stringify_attr/Cargo.toml
index 3369ef22d..4f4055da6 100644
--- a/macro_utilities/stringify_attr/Cargo.toml
+++ b/macro_utilities/stringify_attr/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stringify_attr"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/macro_utilities/stringify_attr/attr_derive/Cargo.toml b/macro_utilities/stringify_attr/attr_derive/Cargo.toml
index b637dd6f5..3f760b30f 100644
--- a/macro_utilities/stringify_attr/attr_derive/Cargo.toml
+++ b/macro_utilities/stringify_attr/attr_derive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "attr_derive"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [lib]
diff --git a/macro_utilities/stringify_attr/attr_derive/src/lib.rs b/macro_utilities/stringify_attr/attr_derive/src/lib.rs
index 66344d028..a568250f5 100644
--- a/macro_utilities/stringify_attr/attr_derive/src/lib.rs
+++ b/macro_utilities/stringify_attr/attr_derive/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/attr_derive/src/models.rs b/macro_utilities/stringify_attr/attr_derive/src/models.rs
index 2f06e48e7..d28c3b4fa 100644
--- a/macro_utilities/stringify_attr/attr_derive/src/models.rs
+++ b/macro_utilities/stringify_attr/attr_derive/src/models.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/attr_derive/src/parse.rs b/macro_utilities/stringify_attr/attr_derive/src/parse.rs
index ce8efc522..d0379cc30 100644
--- a/macro_utilities/stringify_attr/attr_derive/src/parse.rs
+++ b/macro_utilities/stringify_attr/attr_derive/src/parse.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/attr_derive/src/util.rs b/macro_utilities/stringify_attr/attr_derive/src/util.rs
index 4023673ac..80dab8ffe 100644
--- a/macro_utilities/stringify_attr/attr_derive/src/util.rs
+++ b/macro_utilities/stringify_attr/attr_derive/src/util.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/lib.rs b/macro_utilities/stringify_attr/src/lib.rs
index 62c051abd..6755fbc7b 100644
--- a/macro_utilities/stringify_attr/src/lib.rs
+++ b/macro_utilities/stringify_attr/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/pre-commit b/pre-commit
index b241d41d0..fa82848f4 100644
--- a/pre-commit
+++ b/pre-commit
@@ -1,5 +1,19 @@
 #!/bin/sh
 
+# Copyright 2015-2021 Swim Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 set -e
 
 echo '+cargo test --all'
diff --git a/ratchet/Cargo.toml b/ratchet/Cargo.toml
index f944a09c1..dc153fd96 100644
--- a/ratchet/Cargo.toml
+++ b/ratchet/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ratchet"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 description = "Async WebSocket implementation"
 keywords = ["websocket", "async", "futures", "tokio"]
diff --git a/ratchet/LICENSE b/ratchet/LICENSE
index f5ef7e918..f12c2f9c0 100644
--- a/ratchet/LICENSE
+++ b/ratchet/LICENSE
@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2021 SWIM.AI inc.
+   Copyright 2021 Swim Inc.
 
    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/ratchet/examples/autobahn-client.rs b/ratchet/examples/autobahn-client.rs
index dd04764b8..8504fb712 100644
--- a/ratchet/examples/autobahn-client.rs
+++ b/ratchet/examples/autobahn-client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/examples/autobahn-server.rs b/ratchet/examples/autobahn-server.rs
index 6e416a93b..ab9288699 100644
--- a/ratchet/examples/autobahn-server.rs
+++ b/ratchet/examples/autobahn-server.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/examples/client.rs b/ratchet/examples/client.rs
index b04c079de..9bf21adce 100644
--- a/ratchet/examples/client.rs
+++ b/ratchet/examples/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/examples/server.rs b/ratchet/examples/server.rs
index 188d24bf8..e45338d5f 100644
--- a/ratchet/examples/server.rs
+++ b/ratchet/examples/server.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/Cargo.toml b/ratchet/ratchet_core/Cargo.toml
index 226a9b704..a84fee9a8 100644
--- a/ratchet/ratchet_core/Cargo.toml
+++ b/ratchet/ratchet_core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ratchet_core"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 description = "Async WebSocket implementation"
 keywords = ["websocket", "async", "futures", "tokio"]
diff --git a/ratchet/ratchet_core/LICENSE b/ratchet/ratchet_core/LICENSE
index f5ef7e918..f12c2f9c0 100644
--- a/ratchet/ratchet_core/LICENSE
+++ b/ratchet/ratchet_core/LICENSE
@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2021 SWIM.AI inc.
+   Copyright 2021 Swim Inc.
 
    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/ratchet/ratchet_core/src/builder.rs b/ratchet/ratchet_core/src/builder.rs
index 8d8ab35d1..21c3dfa9e 100644
--- a/ratchet/ratchet_core/src/builder.rs
+++ b/ratchet/ratchet_core/src/builder.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/errors.rs b/ratchet/ratchet_core/src/errors.rs
index b5a0dddd4..36f8be250 100644
--- a/ratchet/ratchet_core/src/errors.rs
+++ b/ratchet/ratchet_core/src/errors.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/ext.rs b/ratchet/ratchet_core/src/ext.rs
index cc8de0d98..55329b7ba 100644
--- a/ratchet/ratchet_core/src/ext.rs
+++ b/ratchet/ratchet_core/src/ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/framed/mod.rs b/ratchet/ratchet_core/src/framed/mod.rs
index 0647db175..5d28d5709 100644
--- a/ratchet/ratchet_core/src/framed/mod.rs
+++ b/ratchet/ratchet_core/src/framed/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/client/encoding.rs b/ratchet/ratchet_core/src/handshake/client/encoding.rs
index 3d33e8879..052248cd2 100644
--- a/ratchet/ratchet_core/src/handshake/client/encoding.rs
+++ b/ratchet/ratchet_core/src/handshake/client/encoding.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/client/mod.rs b/ratchet/ratchet_core/src/handshake/client/mod.rs
index 101bd7b4b..835dc18c7 100644
--- a/ratchet/ratchet_core/src/handshake/client/mod.rs
+++ b/ratchet/ratchet_core/src/handshake/client/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/io.rs b/ratchet/ratchet_core/src/handshake/io.rs
index a184ea37e..944b6031a 100644
--- a/ratchet/ratchet_core/src/handshake/io.rs
+++ b/ratchet/ratchet_core/src/handshake/io.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/mod.rs b/ratchet/ratchet_core/src/handshake/mod.rs
index 15364be49..faa49e1fd 100644
--- a/ratchet/ratchet_core/src/handshake/mod.rs
+++ b/ratchet/ratchet_core/src/handshake/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/server/encoding.rs b/ratchet/ratchet_core/src/handshake/server/encoding.rs
index 8391a6847..8d56c9897 100644
--- a/ratchet/ratchet_core/src/handshake/server/encoding.rs
+++ b/ratchet/ratchet_core/src/handshake/server/encoding.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/server/mod.rs b/ratchet/ratchet_core/src/handshake/server/mod.rs
index 6ab13b651..7dd0d581f 100644
--- a/ratchet/ratchet_core/src/handshake/server/mod.rs
+++ b/ratchet/ratchet_core/src/handshake/server/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/subprotocols.rs b/ratchet/ratchet_core/src/handshake/subprotocols.rs
index ea2b5a15a..f8b737157 100644
--- a/ratchet/ratchet_core/src/handshake/subprotocols.rs
+++ b/ratchet/ratchet_core/src/handshake/subprotocols.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/lib.rs b/ratchet/ratchet_core/src/lib.rs
index d0a529084..d3b02b280 100644
--- a/ratchet/ratchet_core/src/lib.rs
+++ b/ratchet/ratchet_core/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/protocol/frame.rs b/ratchet/ratchet_core/src/protocol/frame.rs
index 795735a9b..81698045e 100644
--- a/ratchet/ratchet_core/src/protocol/frame.rs
+++ b/ratchet/ratchet_core/src/protocol/frame.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/protocol/mask.rs b/ratchet/ratchet_core/src/protocol/mask.rs
index cc26973b1..aa1173ed6 100644
--- a/ratchet/ratchet_core/src/protocol/mask.rs
+++ b/ratchet/ratchet_core/src/protocol/mask.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/protocol/mod.rs b/ratchet/ratchet_core/src/protocol/mod.rs
index 79cc3de63..fd575bec9 100644
--- a/ratchet/ratchet_core/src/protocol/mod.rs
+++ b/ratchet/ratchet_core/src/protocol/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/split/bilock/mod.rs b/ratchet/ratchet_core/src/split/bilock/mod.rs
index 6c229ddc9..35f367bcf 100644
--- a/ratchet/ratchet_core/src/split/bilock/mod.rs
+++ b/ratchet/ratchet_core/src/split/bilock/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/split/mod.rs b/ratchet/ratchet_core/src/split/mod.rs
index 54de7c46a..978abd8da 100644
--- a/ratchet/ratchet_core/src/split/mod.rs
+++ b/ratchet/ratchet_core/src/split/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/ws.rs b/ratchet/ratchet_core/src/ws.rs
index ec4908840..8b891273f 100644
--- a/ratchet/ratchet_core/src/ws.rs
+++ b/ratchet/ratchet_core/src/ws.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_deflate/Cargo.toml b/ratchet/ratchet_deflate/Cargo.toml
index 7ebfa779e..2db426627 100644
--- a/ratchet/ratchet_deflate/Cargo.toml
+++ b/ratchet/ratchet_deflate/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ratchet_deflate"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 description = "Permessage Deflate for Ratchet"
 keywords = ["websocket", "async", "futures", "tokio", "deflate"]
diff --git a/ratchet/ratchet_deflate/LICENSE b/ratchet/ratchet_deflate/LICENSE
index f5ef7e918..f12c2f9c0 100644
--- a/ratchet/ratchet_deflate/LICENSE
+++ b/ratchet/ratchet_deflate/LICENSE
@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2021 SWIM.AI inc.
+   Copyright 2021 Swim Inc.
 
    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/ratchet/ratchet_deflate/src/codec.rs b/ratchet/ratchet_deflate/src/codec.rs
index 680bfbe9e..312e532d4 100644
--- a/ratchet/ratchet_deflate/src/codec.rs
+++ b/ratchet/ratchet_deflate/src/codec.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_deflate/src/error.rs b/ratchet/ratchet_deflate/src/error.rs
index fd66985f5..32cdb8925 100644
--- a/ratchet/ratchet_deflate/src/error.rs
+++ b/ratchet/ratchet_deflate/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_deflate/src/handshake.rs b/ratchet/ratchet_deflate/src/handshake.rs
index 898b2208e..169c1fafe 100644
--- a/ratchet/ratchet_deflate/src/handshake.rs
+++ b/ratchet/ratchet_deflate/src/handshake.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_deflate/src/lib.rs b/ratchet/ratchet_deflate/src/lib.rs
index aa4794393..e34ad56bd 100644
--- a/ratchet/ratchet_deflate/src/lib.rs
+++ b/ratchet/ratchet_deflate/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_ext/Cargo.toml b/ratchet/ratchet_ext/Cargo.toml
index e59b86ba7..462c58aff 100644
--- a/ratchet/ratchet_ext/Cargo.toml
+++ b/ratchet/ratchet_ext/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ratchet_ext"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 description = "WebSocket extensions for Ratchet"
 keywords = ["websocket", "async", "futures", "tokio"]
diff --git a/ratchet/ratchet_ext/LICENSE b/ratchet/ratchet_ext/LICENSE
index f5ef7e918..f12c2f9c0 100644
--- a/ratchet/ratchet_ext/LICENSE
+++ b/ratchet/ratchet_ext/LICENSE
@@ -176,7 +176,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2021 SWIM.AI inc.
+   Copyright 2021 Swim Inc.
 
    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/ratchet/ratchet_ext/src/lib.rs b/ratchet/ratchet_ext/src/lib.rs
index d02fab864..d5215d9a7 100644
--- a/ratchet/ratchet_ext/src/lib.rs
+++ b/ratchet/ratchet_ext/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_fixture/src/lib.rs b/ratchet/ratchet_fixture/src/lib.rs
index 0ab37f702..6ee3e4128 100644
--- a/ratchet/ratchet_fixture/src/lib.rs
+++ b/ratchet/ratchet_fixture/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/src/lib.rs b/ratchet/src/lib.rs
index 9c131be56..b03919aa4 100644
--- a/ratchet/src/lib.rs
+++ b/ratchet/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/remove-commit-hook.sh b/remove-commit-hook.sh
index 89d7ee0b6..db37b7087 100644
--- a/remove-commit-hook.sh
+++ b/remove-commit-hook.sh
@@ -1,3 +1,17 @@
 #!/bin/bash
+# Copyright 2015-2021 Swim Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 rm "$DIR/.git/hooks/pre-commit"
diff --git a/runtime/swim_async_runtime/Cargo.toml b/runtime/swim_async_runtime/Cargo.toml
index 10692659c..bb7eb4665 100644
--- a/runtime/swim_async_runtime/Cargo.toml
+++ b/runtime/swim_async_runtime/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_async_runtime"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/runtime/swim_async_runtime/src/lib.rs b/runtime/swim_async_runtime/src/lib.rs
index b54a6b56f..47eafe1b4 100644
--- a/runtime/swim_async_runtime/src/lib.rs
+++ b/runtime/swim_async_runtime/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_async_runtime/src/task.rs b/runtime/swim_async_runtime/src/task.rs
index 09129c9ef..497807f45 100644
--- a/runtime/swim_async_runtime/src/task.rs
+++ b/runtime/swim_async_runtime/src/task.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_async_runtime/src/time.rs b/runtime/swim_async_runtime/src/time.rs
index c2dd4bba1..8742e0767 100644
--- a/runtime/swim_async_runtime/src/time.rs
+++ b/runtime/swim_async_runtime/src/time.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/Cargo.toml b/runtime/swim_runtime/Cargo.toml
index 2fc61208b..156d7f950 100644
--- a/runtime/swim_runtime/Cargo.toml
+++ b/runtime/swim_runtime/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_runtime"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/runtime/swim_runtime/src/backpressure/keyed/common.rs b/runtime/swim_runtime/src/backpressure/keyed/common.rs
index 3ffb9e2e4..ae8cdf948 100644
--- a/runtime/swim_runtime/src/backpressure/keyed/common.rs
+++ b/runtime/swim_runtime/src/backpressure/keyed/common.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/backpressure/keyed/map/mod.rs b/runtime/swim_runtime/src/backpressure/keyed/map/mod.rs
index 237ef7053..39e1cea05 100644
--- a/runtime/swim_runtime/src/backpressure/keyed/map/mod.rs
+++ b/runtime/swim_runtime/src/backpressure/keyed/map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/backpressure/keyed/mod.rs b/runtime/swim_runtime/src/backpressure/keyed/mod.rs
index bfd315ae0..17be0f10c 100644
--- a/runtime/swim_runtime/src/backpressure/keyed/mod.rs
+++ b/runtime/swim_runtime/src/backpressure/keyed/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/backpressure/mod.rs b/runtime/swim_runtime/src/backpressure/mod.rs
index 56fe1f580..ec54c00d3 100644
--- a/runtime/swim_runtime/src/backpressure/mod.rs
+++ b/runtime/swim_runtime/src/backpressure/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/configuration/mod.rs b/runtime/swim_runtime/src/configuration/mod.rs
index 93fcd0e5e..6138d61b0 100644
--- a/runtime/swim_runtime/src/configuration/mod.rs
+++ b/runtime/swim_runtime/src/configuration/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/configuration/recognizers/mod.rs b/runtime/swim_runtime/src/configuration/recognizers/mod.rs
index 5b5549c02..f10daae8a 100644
--- a/runtime/swim_runtime/src/configuration/recognizers/mod.rs
+++ b/runtime/swim_runtime/src/configuration/recognizers/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/capacity.rs b/runtime/swim_runtime/src/error/capacity.rs
index 09b723d03..39eb5986b 100644
--- a/runtime/swim_runtime/src/error/capacity.rs
+++ b/runtime/swim_runtime/src/error/capacity.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/closed.rs b/runtime/swim_runtime/src/error/closed.rs
index a30e5a8d0..19c7729cb 100644
--- a/runtime/swim_runtime/src/error/closed.rs
+++ b/runtime/swim_runtime/src/error/closed.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/encoding.rs b/runtime/swim_runtime/src/error/encoding.rs
index 4a3ef815c..7a84f2702 100644
--- a/runtime/swim_runtime/src/error/encoding.rs
+++ b/runtime/swim_runtime/src/error/encoding.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/http.rs b/runtime/swim_runtime/src/error/http.rs
index f6745119a..2af9b7e54 100644
--- a/runtime/swim_runtime/src/error/http.rs
+++ b/runtime/swim_runtime/src/error/http.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/io.rs b/runtime/swim_runtime/src/error/io.rs
index 8475e6086..e48158d58 100644
--- a/runtime/swim_runtime/src/error/io.rs
+++ b/runtime/swim_runtime/src/error/io.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/mod.rs b/runtime/swim_runtime/src/error/mod.rs
index 7f618123a..274920b0c 100644
--- a/runtime/swim_runtime/src/error/mod.rs
+++ b/runtime/swim_runtime/src/error/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/protocol.rs b/runtime/swim_runtime/src/error/protocol.rs
index 7533370f2..75c1a6035 100644
--- a/runtime/swim_runtime/src/error/protocol.rs
+++ b/runtime/swim_runtime/src/error/protocol.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/resolution.rs b/runtime/swim_runtime/src/error/resolution.rs
index 4515dad86..a4645f007 100644
--- a/runtime/swim_runtime/src/error/resolution.rs
+++ b/runtime/swim_runtime/src/error/resolution.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/routing.rs b/runtime/swim_runtime/src/error/routing.rs
index 837d76559..1f19c040e 100644
--- a/runtime/swim_runtime/src/error/routing.rs
+++ b/runtime/swim_runtime/src/error/routing.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/tls.rs b/runtime/swim_runtime/src/error/tls.rs
index 4e4689988..3a206ac52 100644
--- a/runtime/swim_runtime/src/error/tls.rs
+++ b/runtime/swim_runtime/src/error/tls.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/lib.rs b/runtime/swim_runtime/src/lib.rs
index 607eb20cf..514327b89 100644
--- a/runtime/swim_runtime/src/lib.rs
+++ b/runtime/swim_runtime/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/addresses/mod.rs b/runtime/swim_runtime/src/remote/addresses/mod.rs
index 85318c522..114b8b8d3 100644
--- a/runtime/swim_runtime/src/remote/addresses/mod.rs
+++ b/runtime/swim_runtime/src/remote/addresses/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/config/mod.rs b/runtime/swim_runtime/src/remote/config/mod.rs
index 39c25dcff..18b92e73f 100644
--- a/runtime/swim_runtime/src/remote/config/mod.rs
+++ b/runtime/swim_runtime/src/remote/config/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/mod.rs b/runtime/swim_runtime/src/remote/mod.rs
index e3e3d7221..33f33c35e 100644
--- a/runtime/swim_runtime/src/remote/mod.rs
+++ b/runtime/swim_runtime/src/remote/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/net/dns.rs b/runtime/swim_runtime/src/remote/net/dns.rs
index 8dfae36cf..a798c5816 100644
--- a/runtime/swim_runtime/src/remote/net/dns.rs
+++ b/runtime/swim_runtime/src/remote/net/dns.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/net/mod.rs b/runtime/swim_runtime/src/remote/net/mod.rs
index 3b664fb1c..a380bb07f 100644
--- a/runtime/swim_runtime/src/remote/net/mod.rs
+++ b/runtime/swim_runtime/src/remote/net/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/net/plain.rs b/runtime/swim_runtime/src/remote/net/plain.rs
index 6ddc7a272..a5df38ddd 100644
--- a/runtime/swim_runtime/src/remote/net/plain.rs
+++ b/runtime/swim_runtime/src/remote/net/plain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/net/tls.rs b/runtime/swim_runtime/src/remote/net/tls.rs
index a1c9f9ca6..8a26276f3 100644
--- a/runtime/swim_runtime/src/remote/net/tls.rs
+++ b/runtime/swim_runtime/src/remote/net/tls.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/pending/mod.rs b/runtime/swim_runtime/src/remote/pending/mod.rs
index 1fd538232..354d42edb 100644
--- a/runtime/swim_runtime/src/remote/pending/mod.rs
+++ b/runtime/swim_runtime/src/remote/pending/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/router/mod.rs b/runtime/swim_runtime/src/remote/router/mod.rs
index 606bd0442..49adc38d0 100644
--- a/runtime/swim_runtime/src/remote/router/mod.rs
+++ b/runtime/swim_runtime/src/remote/router/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/state/mod.rs b/runtime/swim_runtime/src/remote/state/mod.rs
index 2c5f454d0..8fa5508e2 100644
--- a/runtime/swim_runtime/src/remote/state/mod.rs
+++ b/runtime/swim_runtime/src/remote/state/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/table/mod.rs b/runtime/swim_runtime/src/remote/table/mod.rs
index 00d3d275a..86f1690b7 100644
--- a/runtime/swim_runtime/src/remote/table/mod.rs
+++ b/runtime/swim_runtime/src/remote/table/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/task/mod.rs b/runtime/swim_runtime/src/remote/task/mod.rs
index 81096099e..a42531d73 100644
--- a/runtime/swim_runtime/src/remote/task/mod.rs
+++ b/runtime/swim_runtime/src/remote/task/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/routing/mod.rs b/runtime/swim_runtime/src/routing/mod.rs
index 084e40fe0..1b0a5e189 100644
--- a/runtime/swim_runtime/src/routing/mod.rs
+++ b/runtime/swim_runtime/src/routing/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/ws/ext.rs b/runtime/swim_runtime/src/ws/ext.rs
index a69d315c6..2ddbb1431 100644
--- a/runtime/swim_runtime/src/ws/ext.rs
+++ b/runtime/swim_runtime/src/ws/ext.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/ws/mod.rs b/runtime/swim_runtime/src/ws/mod.rs
index c13f2738c..9037ac199 100644
--- a/runtime/swim_runtime/src/ws/mod.rs
+++ b/runtime/swim_runtime/src/ws/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/ws/protocol.rs b/runtime/swim_runtime/src/ws/protocol.rs
index 6b430607f..55a94db99 100644
--- a/runtime/swim_runtime/src/ws/protocol.rs
+++ b/runtime/swim_runtime/src/ws/protocol.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/ws/swim_ratchet.rs b/runtime/swim_runtime/src/ws/swim_ratchet.rs
index ef86ea8f2..d3adfd832 100644
--- a/runtime/swim_runtime/src/ws/swim_ratchet.rs
+++ b/runtime/swim_runtime/src/ws/swim_ratchet.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/ws/switcher.rs b/runtime/swim_runtime/src/ws/switcher.rs
index cef19a9a2..d6cff2121 100644
--- a/runtime/swim_runtime/src/ws/switcher.rs
+++ b/runtime/swim_runtime/src/ws/switcher.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/ws/tls.rs b/runtime/swim_runtime/src/ws/tls.rs
index 93e689246..4e3e00d21 100644
--- a/runtime/swim_runtime/src/ws/tls.rs
+++ b/runtime/swim_runtime/src/ws/tls.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/ws/tungstenite.rs b/runtime/swim_runtime/src/ws/tungstenite.rs
deleted file mode 100644
index 8b1378917..000000000
--- a/runtime/swim_runtime/src/ws/tungstenite.rs
+++ /dev/null
@@ -1,1 +0,0 @@
-
diff --git a/runtime/swim_runtime/src/ws/utils.rs b/runtime/swim_runtime/src/ws/utils.rs
index 65fd4f5f0..d7d35d390 100644
--- a/runtime/swim_runtime/src/ws/utils.rs
+++ b/runtime/swim_runtime/src/ws/utils.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/Cargo.toml b/stm/Cargo.toml
index f756bbe5a..b5b808083 100644
--- a/stm/Cargo.toml
+++ b/stm/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "stm"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/stm/src/lib.rs b/stm/src/lib.rs
index 21a35a098..f4bcfdc6a 100644
--- a/stm/src/lib.rs
+++ b/stm/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/local/mod.rs b/stm/src/local/mod.rs
index dbe943330..d0c4f98d4 100644
--- a/stm/src/local/mod.rs
+++ b/stm/src/local/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/ptr/mod.rs b/stm/src/ptr/mod.rs
index e0fc9adad..5a57ecb3a 100644
--- a/stm/src/ptr/mod.rs
+++ b/stm/src/ptr/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/stm/mod.rs b/stm/src/stm/mod.rs
index 62f5ed7b4..38117b13e 100644
--- a/stm/src/stm/mod.rs
+++ b/stm/src/stm/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/stm/stm_futures.rs b/stm/src/stm/stm_futures.rs
index 980a5b951..51544dcba 100644
--- a/stm/src/stm/stm_futures.rs
+++ b/stm/src/stm/stm_futures.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/transaction/frame_mask/mod.rs b/stm/src/transaction/frame_mask/mod.rs
index c379b6d7c..51d1a261a 100644
--- a/stm/src/transaction/frame_mask/mod.rs
+++ b/stm/src/transaction/frame_mask/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/transaction/mod.rs b/stm/src/transaction/mod.rs
index fdb7aef81..c38cf453c 100644
--- a/stm/src/transaction/mod.rs
+++ b/stm/src/transaction/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/var/mod.rs b/stm/src/var/mod.rs
index f121a0d6c..2c7fe1300 100644
--- a/stm/src/var/mod.rs
+++ b/stm/src/var/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/var/observer.rs b/stm/src/var/observer.rs
index b1f3a692c..b57d572ee 100644
--- a/stm/src/var/observer.rs
+++ b/stm/src/var/observer.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/Cargo.toml b/swim_client/Cargo.toml
index 41792f66b..5a25ef118 100644
--- a/swim_client/Cargo.toml
+++ b/swim_client/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_client"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [features]
diff --git a/swim_client/src/configuration/mod.rs b/swim_client/src/configuration/mod.rs
index 717fd7973..b0ee14189 100644
--- a/swim_client/src/configuration/mod.rs
+++ b/swim_client/src/configuration/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/configuration/recognizers.rs b/swim_client/src/configuration/recognizers.rs
index cf463dff7..f007a5791 100644
--- a/swim_client/src/configuration/recognizers.rs
+++ b/swim_client/src/configuration/recognizers.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/configuration/tags.rs b/swim_client/src/configuration/tags.rs
index a0ececc2f..1a33dda61 100644
--- a/swim_client/src/configuration/tags.rs
+++ b/swim_client/src/configuration/tags.rs
@@ -1,3 +1,17 @@
+// Copyright 2015-2021 Swim Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 pub const CONFIG_TAG: &str = "config";
 pub const REMOTE_CONNECTIONS_TAG: &str = "remote_connections";
 pub const WEBSOCKET_CONNECTIONS_TAG: &str = "websocket_connections";
diff --git a/swim_client/src/configuration/writers.rs b/swim_client/src/configuration/writers.rs
index c7df67227..aca8d1c39 100644
--- a/swim_client/src/configuration/writers.rs
+++ b/swim_client/src/configuration/writers.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/connections/mod.rs b/swim_client/src/connections/mod.rs
index db4d183ba..2a9d50d5a 100644
--- a/swim_client/src/connections/mod.rs
+++ b/swim_client/src/connections/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/error/mod.rs b/swim_client/src/downlink/error/mod.rs
index b216ef5f9..c60f620f1 100644
--- a/swim_client/src/downlink/error/mod.rs
+++ b/swim_client/src/downlink/error/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/mod.rs b/swim_client/src/downlink/mod.rs
index b48a13d5b..f78f5d0ea 100644
--- a/swim_client/src/downlink/mod.rs
+++ b/swim_client/src/downlink/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/model/map/mod.rs b/swim_client/src/downlink/model/map/mod.rs
index b8b8dd61f..d0c648f5a 100644
--- a/swim_client/src/downlink/model/map/mod.rs
+++ b/swim_client/src/downlink/model/map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/model/mod.rs b/swim_client/src/downlink/model/mod.rs
index dfc404b6d..606af68dd 100644
--- a/swim_client/src/downlink/model/mod.rs
+++ b/swim_client/src/downlink/model/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/model/value/mod.rs b/swim_client/src/downlink/model/value/mod.rs
index 60228405c..d86fe1e32 100644
--- a/swim_client/src/downlink/model/value/mod.rs
+++ b/swim_client/src/downlink/model/value/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/command/mod.rs b/swim_client/src/downlink/state_machine/command/mod.rs
index d95c5f0f7..87d97dcb1 100644
--- a/swim_client/src/downlink/state_machine/command/mod.rs
+++ b/swim_client/src/downlink/state_machine/command/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/event/mod.rs b/swim_client/src/downlink/state_machine/event/mod.rs
index 14aadbfe9..56d96a119 100644
--- a/swim_client/src/downlink/state_machine/event/mod.rs
+++ b/swim_client/src/downlink/state_machine/event/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/map/mod.rs b/swim_client/src/downlink/state_machine/map/mod.rs
index 978b6b82a..ee0fac3dd 100644
--- a/swim_client/src/downlink/state_machine/map/mod.rs
+++ b/swim_client/src/downlink/state_machine/map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/mod.rs b/swim_client/src/downlink/state_machine/mod.rs
index 1ae29ba8d..bd1206433 100644
--- a/swim_client/src/downlink/state_machine/mod.rs
+++ b/swim_client/src/downlink/state_machine/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/value/mod.rs b/swim_client/src/downlink/state_machine/value/mod.rs
index 3e40ef90e..56d72785d 100644
--- a/swim_client/src/downlink/state_machine/value/mod.rs
+++ b/swim_client/src/downlink/state_machine/value/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/subscription/envelopes/mod.rs b/swim_client/src/downlink/subscription/envelopes/mod.rs
index 082f3282c..58cf76078 100644
--- a/swim_client/src/downlink/subscription/envelopes/mod.rs
+++ b/swim_client/src/downlink/subscription/envelopes/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/subscription/mod.rs b/swim_client/src/downlink/subscription/mod.rs
index aeb61460c..89c91472b 100644
--- a/swim_client/src/downlink/subscription/mod.rs
+++ b/swim_client/src/downlink/subscription/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/subscription/watch_adapter/mod.rs b/swim_client/src/downlink/subscription/watch_adapter/mod.rs
index fb36e2ce6..f444b33f2 100644
--- a/swim_client/src/downlink/subscription/watch_adapter/mod.rs
+++ b/swim_client/src/downlink/subscription/watch_adapter/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/command/mod.rs b/swim_client/src/downlink/typed/command/mod.rs
index e5bbaae43..532d844c9 100644
--- a/swim_client/src/downlink/typed/command/mod.rs
+++ b/swim_client/src/downlink/typed/command/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/event/mod.rs b/swim_client/src/downlink/typed/event/mod.rs
index 1ff3b59ec..5d19d7573 100644
--- a/swim_client/src/downlink/typed/event/mod.rs
+++ b/swim_client/src/downlink/typed/event/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/map/events.rs b/swim_client/src/downlink/typed/map/events.rs
index 165f495a7..4c062b911 100644
--- a/swim_client/src/downlink/typed/map/events.rs
+++ b/swim_client/src/downlink/typed/map/events.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/map/mod.rs b/swim_client/src/downlink/typed/map/mod.rs
index 82f53ae39..b36ff1f81 100644
--- a/swim_client/src/downlink/typed/map/mod.rs
+++ b/swim_client/src/downlink/typed/map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/mod.rs b/swim_client/src/downlink/typed/mod.rs
index b870a6b5a..14bb2fffb 100644
--- a/swim_client/src/downlink/typed/mod.rs
+++ b/swim_client/src/downlink/typed/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/value/mod.rs b/swim_client/src/downlink/typed/value/mod.rs
index c2c0e90f8..ba8411581 100644
--- a/swim_client/src/downlink/typed/value/mod.rs
+++ b/swim_client/src/downlink/typed/value/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/interface/mod.rs b/swim_client/src/interface/mod.rs
index c8031cef3..15da01b38 100644
--- a/swim_client/src/interface/mod.rs
+++ b/swim_client/src/interface/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/lib.rs b/swim_client/src/lib.rs
index a314863b1..ad90d5824 100644
--- a/swim_client/src/lib.rs
+++ b/swim_client/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/router/mod.rs b/swim_client/src/router/mod.rs
index cffad492f..8f90dbac1 100644
--- a/swim_client/src/router/mod.rs
+++ b/swim_client/src/router/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/Cargo.toml b/swim_server/Cargo.toml
index 76a5d1686..1f874067e 100644
--- a/swim_server/Cargo.toml
+++ b/swim_server/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_server"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [features]
diff --git a/swim_server/agent_derive/Cargo.toml b/swim_server/agent_derive/Cargo.toml
index 8397727e6..94199a231 100644
--- a/swim_server/agent_derive/Cargo.toml
+++ b/swim_server/agent_derive/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "agent_derive"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [lib]
diff --git a/swim_server/agent_derive/src/agent.rs b/swim_server/agent_derive/src/agent.rs
index 201e2e1d6..7511662b9 100644
--- a/swim_server/agent_derive/src/agent.rs
+++ b/swim_server/agent_derive/src/agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/lanes/action.rs b/swim_server/agent_derive/src/lanes/action.rs
index 12c9013ca..fa28f9f42 100644
--- a/swim_server/agent_derive/src/lanes/action.rs
+++ b/swim_server/agent_derive/src/lanes/action.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/lanes/command.rs b/swim_server/agent_derive/src/lanes/command.rs
index 47acb0d6c..efc44b9bd 100644
--- a/swim_server/agent_derive/src/lanes/command.rs
+++ b/swim_server/agent_derive/src/lanes/command.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/lanes/demand.rs b/swim_server/agent_derive/src/lanes/demand.rs
index 3ed7fd090..8eb06378f 100644
--- a/swim_server/agent_derive/src/lanes/demand.rs
+++ b/swim_server/agent_derive/src/lanes/demand.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/lanes/demand_map.rs b/swim_server/agent_derive/src/lanes/demand_map.rs
index 52f9f1948..209b2a7ba 100644
--- a/swim_server/agent_derive/src/lanes/demand_map.rs
+++ b/swim_server/agent_derive/src/lanes/demand_map.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/lanes/map.rs b/swim_server/agent_derive/src/lanes/map.rs
index 1991c7c91..a001b6897 100644
--- a/swim_server/agent_derive/src/lanes/map.rs
+++ b/swim_server/agent_derive/src/lanes/map.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/lanes/mod.rs b/swim_server/agent_derive/src/lanes/mod.rs
index 831fc4f81..0faa83293 100644
--- a/swim_server/agent_derive/src/lanes/mod.rs
+++ b/swim_server/agent_derive/src/lanes/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/lanes/value.rs b/swim_server/agent_derive/src/lanes/value.rs
index 511d05b79..383514912 100644
--- a/swim_server/agent_derive/src/lanes/value.rs
+++ b/swim_server/agent_derive/src/lanes/value.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/lib.rs b/swim_server/agent_derive/src/lib.rs
index 71fb09abc..93862ebe6 100644
--- a/swim_server/agent_derive/src/lib.rs
+++ b/swim_server/agent_derive/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/agent_derive/src/utils.rs b/swim_server/agent_derive/src/utils.rs
index 34d3c29cc..96216357e 100644
--- a/swim_server/agent_derive/src/utils.rs
+++ b/swim_server/agent_derive/src/utils.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/auth/src/lib.rs b/swim_server/auth/src/lib.rs
index e69de29bb..3ca67b81e 100644
--- a/swim_server/auth/src/lib.rs
+++ b/swim_server/auth/src/lib.rs
@@ -0,0 +1,13 @@
+// Copyright 2015-2021 Swim Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
diff --git a/swim_server/server_store/src/agent/lane/error.rs b/swim_server/server_store/src/agent/lane/error.rs
index 1653a7918..13fe7fdd9 100644
--- a/swim_server/server_store/src/agent/lane/error.rs
+++ b/swim_server/server_store/src/agent/lane/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/mod.rs b/swim_server/server_store/src/agent/lane/mod.rs
index 4219fed25..735f2e857 100644
--- a/swim_server/server_store/src/agent/lane/mod.rs
+++ b/swim_server/server_store/src/agent/lane/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/model/map/io.rs b/swim_server/server_store/src/agent/lane/model/map/io.rs
index 60ee9511a..ff876f0aa 100644
--- a/swim_server/server_store/src/agent/lane/model/map/io.rs
+++ b/swim_server/server_store/src/agent/lane/model/map/io.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/model/map/mod.rs b/swim_server/server_store/src/agent/lane/model/map/mod.rs
index f5f87ba9f..cc4b0a234 100644
--- a/swim_server/server_store/src/agent/lane/model/map/mod.rs
+++ b/swim_server/server_store/src/agent/lane/model/map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/model/mod.rs b/swim_server/server_store/src/agent/lane/model/mod.rs
index dfc404b6d..606af68dd 100644
--- a/swim_server/server_store/src/agent/lane/model/mod.rs
+++ b/swim_server/server_store/src/agent/lane/model/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/model/value/io.rs b/swim_server/server_store/src/agent/lane/model/value/io.rs
index 05a9d2628..9461aec3d 100644
--- a/swim_server/server_store/src/agent/lane/model/value/io.rs
+++ b/swim_server/server_store/src/agent/lane/model/value/io.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/model/value/mod.rs b/swim_server/server_store/src/agent/lane/model/value/mod.rs
index 7bbe77413..177ea230b 100644
--- a/swim_server/server_store/src/agent/lane/model/value/mod.rs
+++ b/swim_server/server_store/src/agent/lane/model/value/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/task.rs b/swim_server/server_store/src/agent/lane/task.rs
index 622105fbd..99bf5e4f1 100644
--- a/swim_server/server_store/src/agent/lane/task.rs
+++ b/swim_server/server_store/src/agent/lane/task.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/mock/mod.rs b/swim_server/server_store/src/agent/mock/mod.rs
index 36196a73f..c27634a84 100644
--- a/swim_server/server_store/src/agent/mock/mod.rs
+++ b/swim_server/server_store/src/agent/mock/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/mod.rs b/swim_server/server_store/src/agent/mod.rs
index fa8df55ee..caec4e9e5 100644
--- a/swim_server/server_store/src/agent/mod.rs
+++ b/swim_server/server_store/src/agent/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/lib.rs b/swim_server/server_store/src/lib.rs
index 2041407ea..15a103780 100644
--- a/swim_server/server_store/src/lib.rs
+++ b/swim_server/server_store/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/plane/mock.rs b/swim_server/server_store/src/plane/mock.rs
index 1e7d19d84..eae06b73b 100644
--- a/swim_server/server_store/src/plane/mock.rs
+++ b/swim_server/server_store/src/plane/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/plane/mod.rs b/swim_server/server_store/src/plane/mod.rs
index 62155cd10..bfac88854 100644
--- a/swim_server/server_store/src/plane/mod.rs
+++ b/swim_server/server_store/src/plane/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/server/keystore.rs b/swim_server/server_store/src/server/keystore.rs
index d56ecff87..2f6a83019 100644
--- a/swim_server/server_store/src/server/keystore.rs
+++ b/swim_server/server_store/src/server/keystore.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/server/mock.rs b/swim_server/server_store/src/server/mock.rs
index 6baf8066b..ab8bc7d21 100644
--- a/swim_server/server_store/src/server/mock.rs
+++ b/swim_server/server_store/src/server/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/server/mod.rs b/swim_server/server_store/src/server/mod.rs
index 0864645c0..545d7f0a6 100644
--- a/swim_server/server_store/src/server/mod.rs
+++ b/swim_server/server_store/src/server/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/server/rocks.rs b/swim_server/server_store/src/server/rocks.rs
index fcca0a062..5c327a0c0 100644
--- a/swim_server/server_store/src/server/rocks.rs
+++ b/swim_server/server_store/src/server/rocks.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/context/mod.rs b/swim_server/src/agent/context/mod.rs
index ff94dd3f0..fb63c7d6f 100644
--- a/swim_server/src/agent/context/mod.rs
+++ b/swim_server/src/agent/context/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/dispatch/error.rs b/swim_server/src/agent/dispatch/error.rs
index b1e5faf3f..4646ef41a 100644
--- a/swim_server/src/agent/dispatch/error.rs
+++ b/swim_server/src/agent/dispatch/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/dispatch/mod.rs b/swim_server/src/agent/dispatch/mod.rs
index a24cefcb6..dbd9e141d 100644
--- a/swim_server/src/agent/dispatch/mod.rs
+++ b/swim_server/src/agent/dispatch/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/mod.rs b/swim_server/src/agent/lane/channels/mod.rs
index 7a43044a3..67e1d7b48 100644
--- a/swim_server/src/agent/lane/channels/mod.rs
+++ b/swim_server/src/agent/lane/channels/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/task/mod.rs b/swim_server/src/agent/lane/channels/task/mod.rs
index f2f1a90ef..0bf92a588 100644
--- a/swim_server/src/agent/lane/channels/task/mod.rs
+++ b/swim_server/src/agent/lane/channels/task/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/action/mod.rs b/swim_server/src/agent/lane/channels/update/action/mod.rs
index 069eb536f..e8144f64c 100644
--- a/swim_server/src/agent/lane/channels/update/action/mod.rs
+++ b/swim_server/src/agent/lane/channels/update/action/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/command/mod.rs b/swim_server/src/agent/lane/channels/update/command/mod.rs
index e21836ea6..a9e50d99e 100644
--- a/swim_server/src/agent/lane/channels/update/command/mod.rs
+++ b/swim_server/src/agent/lane/channels/update/command/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/map/mod.rs b/swim_server/src/agent/lane/channels/update/map/mod.rs
index 21a1e8966..aa9fd7bc8 100644
--- a/swim_server/src/agent/lane/channels/update/map/mod.rs
+++ b/swim_server/src/agent/lane/channels/update/map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/mod.rs b/swim_server/src/agent/lane/channels/update/mod.rs
index abaa59ec9..5c328f3e9 100644
--- a/swim_server/src/agent/lane/channels/update/mod.rs
+++ b/swim_server/src/agent/lane/channels/update/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/value/mod.rs b/swim_server/src/agent/lane/channels/update/value/mod.rs
index eae75c1e4..03a8e060c 100644
--- a/swim_server/src/agent/lane/channels/update/value/mod.rs
+++ b/swim_server/src/agent/lane/channels/update/value/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/backpressure/mod.rs b/swim_server/src/agent/lane/channels/uplink/backpressure/mod.rs
index 384d62041..0931f3613 100644
--- a/swim_server/src/agent/lane/channels/uplink/backpressure/mod.rs
+++ b/swim_server/src/agent/lane/channels/uplink/backpressure/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/map/mod.rs b/swim_server/src/agent/lane/channels/uplink/map/mod.rs
index f37231567..0eaccf43c 100644
--- a/swim_server/src/agent/lane/channels/uplink/map/mod.rs
+++ b/swim_server/src/agent/lane/channels/uplink/map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/mod.rs b/swim_server/src/agent/lane/channels/uplink/mod.rs
index 5d1cbc76d..f60c54bcf 100644
--- a/swim_server/src/agent/lane/channels/uplink/mod.rs
+++ b/swim_server/src/agent/lane/channels/uplink/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/spawn/mod.rs b/swim_server/src/agent/lane/channels/uplink/spawn/mod.rs
index 9216a108f..f6ee4bd8f 100644
--- a/swim_server/src/agent/lane/channels/uplink/spawn/mod.rs
+++ b/swim_server/src/agent/lane/channels/uplink/spawn/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/stateless/mod.rs b/swim_server/src/agent/lane/channels/uplink/stateless/mod.rs
index 7bce3bea8..697f3c8be 100644
--- a/swim_server/src/agent/lane/channels/uplink/stateless/mod.rs
+++ b/swim_server/src/agent/lane/channels/uplink/stateless/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/lifecycle/mod.rs b/swim_server/src/agent/lane/lifecycle/mod.rs
index 4e6c7a04a..03afe511d 100644
--- a/swim_server/src/agent/lane/lifecycle/mod.rs
+++ b/swim_server/src/agent/lane/lifecycle/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/mod.rs b/swim_server/src/agent/lane/mod.rs
index fbe205e41..efaaf7dab 100644
--- a/swim_server/src/agent/lane/mod.rs
+++ b/swim_server/src/agent/lane/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/action/mod.rs b/swim_server/src/agent/lane/model/action/mod.rs
index 296b8b7e9..1decf7873 100644
--- a/swim_server/src/agent/lane/model/action/mod.rs
+++ b/swim_server/src/agent/lane/model/action/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/command/mod.rs b/swim_server/src/agent/lane/model/command/mod.rs
index 42e00ef5c..363b43f28 100644
--- a/swim_server/src/agent/lane/model/command/mod.rs
+++ b/swim_server/src/agent/lane/model/command/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/demand/mod.rs b/swim_server/src/agent/lane/model/demand/mod.rs
index b55809203..b241b67fe 100644
--- a/swim_server/src/agent/lane/model/demand/mod.rs
+++ b/swim_server/src/agent/lane/model/demand/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/demand_map/mod.rs b/swim_server/src/agent/lane/model/demand_map/mod.rs
index a84caa6cd..3dd516b45 100644
--- a/swim_server/src/agent/lane/model/demand_map/mod.rs
+++ b/swim_server/src/agent/lane/model/demand_map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/map/mod.rs b/swim_server/src/agent/lane/model/map/mod.rs
index 2b645b3c8..a8f26e5ca 100644
--- a/swim_server/src/agent/lane/model/map/mod.rs
+++ b/swim_server/src/agent/lane/model/map/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/map/summary/mod.rs b/swim_server/src/agent/lane/model/map/summary/mod.rs
index c37cb17e9..578ba54f6 100644
--- a/swim_server/src/agent/lane/model/map/summary/mod.rs
+++ b/swim_server/src/agent/lane/model/map/summary/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/mod.rs b/swim_server/src/agent/lane/model/mod.rs
index 9f75e96b8..919bf6ce8 100644
--- a/swim_server/src/agent/lane/model/mod.rs
+++ b/swim_server/src/agent/lane/model/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/supply/mod.rs b/swim_server/src/agent/lane/model/supply/mod.rs
index 61e0fa030..73db29747 100644
--- a/swim_server/src/agent/lane/model/supply/mod.rs
+++ b/swim_server/src/agent/lane/model/supply/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/value/mod.rs b/swim_server/src/agent/lane/model/value/mod.rs
index cb91c34dc..7644d9f92 100644
--- a/swim_server/src/agent/lane/model/value/mod.rs
+++ b/swim_server/src/agent/lane/model/value/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lifecycle/mod.rs b/swim_server/src/agent/lifecycle/mod.rs
index e7f912ee8..619d0675d 100644
--- a/swim_server/src/agent/lifecycle/mod.rs
+++ b/swim_server/src/agent/lifecycle/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/mod.rs b/swim_server/src/agent/mod.rs
index b08f209ff..24715cbcc 100644
--- a/swim_server/src/agent/mod.rs
+++ b/swim_server/src/agent/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/interface/mod.rs b/swim_server/src/interface/mod.rs
index 1704d153d..511b23f51 100644
--- a/swim_server/src/interface/mod.rs
+++ b/swim_server/src/interface/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/lib.rs b/swim_server/src/lib.rs
index 0c664032a..6b524ca09 100644
--- a/swim_server/src/lib.rs
+++ b/swim_server/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/macros.rs b/swim_server/src/macros.rs
index 0bbe2131e..5d3d1a70c 100644
--- a/swim_server/src/macros.rs
+++ b/swim_server/src/macros.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/info/mod.rs b/swim_server/src/meta/info/mod.rs
index f67e7b62a..727738eba 100644
--- a/swim_server/src/meta/info/mod.rs
+++ b/swim_server/src/meta/info/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/log/config.rs b/swim_server/src/meta/log/config.rs
index 00aa1b805..f9515b957 100644
--- a/swim_server/src/meta/log/config.rs
+++ b/swim_server/src/meta/log/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/log/mod.rs b/swim_server/src/meta/log/mod.rs
index 2bfb04866..852a2f502 100644
--- a/swim_server/src/meta/log/mod.rs
+++ b/swim_server/src/meta/log/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/mod.rs b/swim_server/src/meta/mod.rs
index ac24f4e2f..c7811a6fa 100644
--- a/swim_server/src/meta/mod.rs
+++ b/swim_server/src/meta/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/pulse.rs b/swim_server/src/meta/pulse.rs
index 4bf5043de..0dbac2d2f 100644
--- a/swim_server/src/meta/pulse.rs
+++ b/swim_server/src/meta/pulse.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/uri.rs b/swim_server/src/meta/uri.rs
index 3003576df..8a5b081c6 100644
--- a/swim_server/src/meta/uri.rs
+++ b/swim_server/src/meta/uri.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/context/mod.rs b/swim_server/src/plane/context/mod.rs
index e44bbeb5b..cfde63481 100644
--- a/swim_server/src/plane/context/mod.rs
+++ b/swim_server/src/plane/context/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/error/mod.rs b/swim_server/src/plane/error/mod.rs
index a34ef20ad..265711929 100644
--- a/swim_server/src/plane/error/mod.rs
+++ b/swim_server/src/plane/error/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/lifecycle/mod.rs b/swim_server/src/plane/lifecycle/mod.rs
index 4d929cd7b..b3c7bfd29 100644
--- a/swim_server/src/plane/lifecycle/mod.rs
+++ b/swim_server/src/plane/lifecycle/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/mod.rs b/swim_server/src/plane/mod.rs
index 2753b5c07..c84a57a3a 100644
--- a/swim_server/src/plane/mod.rs
+++ b/swim_server/src/plane/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/provider/mod.rs b/swim_server/src/plane/provider/mod.rs
index 48a722d91..cde14a921 100644
--- a/swim_server/src/plane/provider/mod.rs
+++ b/swim_server/src/plane/provider/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/router/mod.rs b/swim_server/src/plane/router/mod.rs
index 84dd22e20..28cdf0ade 100644
--- a/swim_server/src/plane/router/mod.rs
+++ b/swim_server/src/plane/router/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/spec/mod.rs b/swim_server/src/plane/spec/mod.rs
index b006a4c7c..026320d61 100644
--- a/swim_server/src/plane/spec/mod.rs
+++ b/swim_server/src/plane/spec/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/routing/mod.rs b/swim_server/src/routing/mod.rs
index a5887c0b8..778337cec 100644
--- a/swim_server/src/routing/mod.rs
+++ b/swim_server/src/routing/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/aggregator.rs b/swim_server/swim_metrics/src/aggregator.rs
index dc231ae6d..c023623e7 100644
--- a/swim_server/swim_metrics/src/aggregator.rs
+++ b/swim_server/swim_metrics/src/aggregator.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/config.rs b/swim_server/swim_metrics/src/config.rs
index e3d2fd9eb..9873a6a80 100644
--- a/swim_server/swim_metrics/src/config.rs
+++ b/swim_server/swim_metrics/src/config.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/lane/mod.rs b/swim_server/swim_metrics/src/lane/mod.rs
index 907d96df3..0ea1c858c 100644
--- a/swim_server/swim_metrics/src/lane/mod.rs
+++ b/swim_server/swim_metrics/src/lane/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/lib.rs b/swim_server/swim_metrics/src/lib.rs
index 4d12fcc59..6d58aeb06 100644
--- a/swim_server/swim_metrics/src/lib.rs
+++ b/swim_server/swim_metrics/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/node/mod.rs b/swim_server/swim_metrics/src/node/mod.rs
index d7dca6b81..50c7a16fa 100644
--- a/swim_server/swim_metrics/src/node/mod.rs
+++ b/swim_server/swim_metrics/src/node/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/uplink/mod.rs b/swim_server/swim_metrics/src/uplink/mod.rs
index 6cfe751be..b867abda7 100644
--- a/swim_server/swim_metrics/src/uplink/mod.rs
+++ b/swim_server/swim_metrics/src/uplink/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/rocks_store/src/iterator.rs b/swim_store/rocks_store/src/iterator.rs
index 1f2e05307..fa443f3fb 100644
--- a/swim_store/rocks_store/src/iterator.rs
+++ b/swim_store/rocks_store/src/iterator.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/rocks_store/src/lib.rs b/swim_store/rocks_store/src/lib.rs
index 5c959c16f..8e9062240 100644
--- a/swim_store/rocks_store/src/lib.rs
+++ b/swim_store/rocks_store/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/src/lib.rs b/swim_store/src/lib.rs
index c4acda137..066b2dd0c 100644
--- a/swim_store/src/lib.rs
+++ b/swim_store/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/src/nostore.rs b/swim_store/src/nostore.rs
index 0bb704021..5c53fbaa0 100644
--- a/swim_store/src/nostore.rs
+++ b/swim_store/src/nostore.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/store_common/src/iterator.rs b/swim_store/store_common/src/iterator.rs
index ebdb67f0a..46774f91c 100644
--- a/swim_store/store_common/src/iterator.rs
+++ b/swim_store/store_common/src/iterator.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/store_common/src/keyspaces.rs b/swim_store/store_common/src/keyspaces.rs
index 831b16650..c9319d5ed 100644
--- a/swim_store/store_common/src/keyspaces.rs
+++ b/swim_store/store_common/src/keyspaces.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/store_common/src/lib.rs b/swim_store/store_common/src/lib.rs
index 594584eda..d2ca1e3a1 100644
--- a/swim_store/store_common/src/lib.rs
+++ b/swim_store/store_common/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/store_common/src/utils.rs b/swim_store/store_common/src/utils.rs
index c2fbee7d1..1ea95665f 100644
--- a/swim_store/store_common/src/utils.rs
+++ b/swim_store/store_common/src/utils.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/Cargo.toml b/swim_utilities/Cargo.toml
index a3019b4ad..7a5a7e70b 100644
--- a/swim_utilities/Cargo.toml
+++ b/swim_utilities/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_utilities"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [features]
diff --git a/swim_utilities/byte_channel/benches/async_throughput.rs b/swim_utilities/byte_channel/benches/async_throughput.rs
index c5f9a9eb7..c6b7c46ec 100644
--- a/swim_utilities/byte_channel/benches/async_throughput.rs
+++ b/swim_utilities/byte_channel/benches/async_throughput.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/byte_channel/src/lib.rs b/swim_utilities/byte_channel/src/lib.rs
index 40a222c84..1e7993639 100644
--- a/swim_utilities/byte_channel/src/lib.rs
+++ b/swim_utilities/byte_channel/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/src/lib.rs b/swim_utilities/src/lib.rs
index 925c58483..40a042304 100644
--- a/swim_utilities/src/lib.rs
+++ b/swim_utilities/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/src/never.rs b/swim_utilities/src/never.rs
index 78954fa98..ee228d8ff 100644
--- a/swim_utilities/src/never.rs
+++ b/swim_utilities/src/never.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/src/ptr/mod.rs b/swim_utilities/src/ptr/mod.rs
index 9405b6432..f2d68743c 100644
--- a/swim_utilities/src/ptr/mod.rs
+++ b/swim_utilities/src/ptr/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_algebra/Cargo.toml b/swim_utilities/swim_algebra/Cargo.toml
index 0aed24dcb..9e1821a44 100644
--- a/swim_utilities/swim_algebra/Cargo.toml
+++ b/swim_utilities/swim_algebra/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_algebra"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_algebra/src/lib.rs b/swim_utilities/swim_algebra/src/lib.rs
index e62638d41..36ec6124c 100644
--- a/swim_utilities/swim_algebra/src/lib.rs
+++ b/swim_utilities/swim_algebra/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_algebra/src/monoid.rs b/swim_utilities/swim_algebra/src/monoid.rs
index 4c64941cd..5313b1d0f 100644
--- a/swim_utilities/swim_algebra/src/monoid.rs
+++ b/swim_utilities/swim_algebra/src/monoid.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_algebra/src/non_zero_usize.rs b/swim_utilities/swim_algebra/src/non_zero_usize.rs
index 2726c5265..8af135a7e 100644
--- a/swim_utilities/swim_algebra/src/non_zero_usize.rs
+++ b/swim_utilities/swim_algebra/src/non_zero_usize.rs
@@ -1,3 +1,17 @@
+// Copyright 2015-2021 Swim Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /// Macro for safely creating NonZeroUsize
 #[macro_export]
 macro_rules! non_zero_usize {
diff --git a/swim_utilities/swim_algebra/src/semigroup.rs b/swim_utilities/swim_algebra/src/semigroup.rs
index 8783bec7f..fe49b905d 100644
--- a/swim_utilities/swim_algebra/src/semigroup.rs
+++ b/swim_utilities/swim_algebra/src/semigroup.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_algebra/src/zero.rs b/swim_utilities/swim_algebra/src/zero.rs
index 38a2f9ce3..d0f29b2b3 100644
--- a/swim_utilities/swim_algebra/src/zero.rs
+++ b/swim_utilities/swim_algebra/src/zero.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_errors/Cargo.toml b/swim_utilities/swim_errors/Cargo.toml
index 15b48f40f..c33c602de 100644
--- a/swim_utilities/swim_errors/Cargo.toml
+++ b/swim_utilities/swim_errors/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_errors"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_errors/src/accumulator.rs b/swim_utilities/swim_errors/src/accumulator.rs
index 1c1adbb4a..9be0cfd34 100644
--- a/swim_utilities/swim_errors/src/accumulator.rs
+++ b/swim_utilities/swim_errors/src/accumulator.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_errors/src/lib.rs b/swim_utilities/swim_errors/src/lib.rs
index 2f13d0984..decf5822a 100644
--- a/swim_utilities/swim_errors/src/lib.rs
+++ b/swim_utilities/swim_errors/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_errors/src/recoverable.rs b/swim_utilities/swim_errors/src/recoverable.rs
index 2b2483c02..5bcf67f0f 100644
--- a/swim_utilities/swim_errors/src/recoverable.rs
+++ b/swim_utilities/swim_errors/src/recoverable.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_errors/src/validation/mod.rs b/swim_utilities/swim_errors/src/validation/mod.rs
index 0232141e3..ba93e89c6 100644
--- a/swim_utilities/swim_errors/src/validation/mod.rs
+++ b/swim_utilities/swim_errors/src/validation/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_format/Cargo.toml b/swim_utilities/swim_format/Cargo.toml
index b640ba2cb..b028544ae 100644
--- a/swim_utilities/swim_format/Cargo.toml
+++ b/swim_utilities/swim_format/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_format"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_format/src/lib.rs b/swim_utilities/swim_format/src/lib.rs
index 60ad6c438..a233e04e0 100644
--- a/swim_utilities/swim_format/src/lib.rs
+++ b/swim_utilities/swim_format/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_format/src/print/mod.rs b/swim_utilities/swim_format/src/print/mod.rs
index 48f63ba47..154d06c93 100644
--- a/swim_utilities/swim_format/src/print/mod.rs
+++ b/swim_utilities/swim_format/src/print/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/Cargo.toml b/swim_utilities/swim_future/Cargo.toml
index 5af56c548..41c3d2a8d 100644
--- a/swim_utilities/swim_future/Cargo.toml
+++ b/swim_utilities/swim_future/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_future"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_future/src/combinators/mod.rs b/swim_utilities/swim_future/src/combinators/mod.rs
index ce3d068f0..1dad86872 100644
--- a/swim_utilities/swim_future/src/combinators/mod.rs
+++ b/swim_utilities/swim_future/src/combinators/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/item_sink/comap/mod.rs b/swim_utilities/swim_future/src/item_sink/comap/mod.rs
index 32d5b3da4..d220bf3c6 100644
--- a/swim_utilities/swim_future/src/item_sink/comap/mod.rs
+++ b/swim_utilities/swim_future/src/item_sink/comap/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/item_sink/drop_all/mod.rs b/swim_utilities/swim_future/src/item_sink/drop_all/mod.rs
index a9b0580f9..acebc209b 100644
--- a/swim_utilities/swim_future/src/item_sink/drop_all/mod.rs
+++ b/swim_utilities/swim_future/src/item_sink/drop_all/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/item_sink/either/mod.rs b/swim_utilities/swim_future/src/item_sink/either/mod.rs
index 52e9bbabb..4e0a5231e 100644
--- a/swim_utilities/swim_future/src/item_sink/either/mod.rs
+++ b/swim_utilities/swim_future/src/item_sink/either/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/item_sink/fail_all/mod.rs b/swim_utilities/swim_future/src/item_sink/fail_all/mod.rs
index 662539454..3dc9bd6e2 100644
--- a/swim_utilities/swim_future/src/item_sink/fail_all/mod.rs
+++ b/swim_utilities/swim_future/src/item_sink/fail_all/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/item_sink/mod.rs b/swim_utilities/swim_future/src/item_sink/mod.rs
index 90ccd4a9d..d13b6bef2 100644
--- a/swim_utilities/swim_future/src/item_sink/mod.rs
+++ b/swim_utilities/swim_future/src/item_sink/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/item_sink/try_send.rs b/swim_utilities/swim_future/src/item_sink/try_send.rs
index b0891867d..4b3f6202a 100644
--- a/swim_utilities/swim_future/src/item_sink/try_send.rs
+++ b/swim_utilities/swim_future/src/item_sink/try_send.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/lib.rs b/swim_utilities/swim_future/src/lib.rs
index 852312786..89d2ba12a 100644
--- a/swim_utilities/swim_future/src/lib.rs
+++ b/swim_utilities/swim_future/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/open_ended/mod.rs b/swim_utilities/swim_future/src/open_ended/mod.rs
index 7fb831cb1..ed0a7d0fb 100644
--- a/swim_utilities/swim_future/src/open_ended/mod.rs
+++ b/swim_utilities/swim_future/src/open_ended/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/request/mod.rs b/swim_utilities/swim_future/src/request/mod.rs
index 00d7f160d..0157c569d 100644
--- a/swim_utilities/swim_future/src/request/mod.rs
+++ b/swim_utilities/swim_future/src/request/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/request/request_future/mod.rs b/swim_utilities/swim_future/src/request/request_future/mod.rs
index cf4e4d245..481cf37f0 100644
--- a/swim_utilities/swim_future/src/request/request_future/mod.rs
+++ b/swim_utilities/swim_future/src/request/request_future/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/retryable/factory.rs b/swim_utilities/swim_future/src/retryable/factory.rs
index dcdd1c9c6..217d8caa3 100644
--- a/swim_utilities/swim_future/src/retryable/factory.rs
+++ b/swim_utilities/swim_future/src/retryable/factory.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/retryable/mod.rs b/swim_utilities/swim_future/src/retryable/mod.rs
index c29be28e8..5b97bc1f4 100644
--- a/swim_utilities/swim_future/src/retryable/mod.rs
+++ b/swim_utilities/swim_future/src/retryable/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/retryable/request.rs b/swim_utilities/swim_future/src/retryable/request.rs
index d8057c25c..9ddadd79c 100644
--- a/swim_utilities/swim_future/src/retryable/request.rs
+++ b/swim_utilities/swim_future/src/retryable/request.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/retryable/strategy.rs b/swim_utilities/swim_future/src/retryable/strategy.rs
index 59d436377..225a94582 100644
--- a/swim_utilities/swim_future/src/retryable/strategy.rs
+++ b/swim_utilities/swim_future/src/retryable/strategy.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/task/mod.rs b/swim_utilities/swim_future/src/task/mod.rs
index e64037d45..c38af4f1b 100644
--- a/swim_utilities/swim_future/src/task/mod.rs
+++ b/swim_utilities/swim_future/src/task/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_io/src/fs.rs b/swim_utilities/swim_io/src/fs.rs
index 6c4f9842c..7ee0edd9d 100644
--- a/swim_utilities/swim_io/src/fs.rs
+++ b/swim_utilities/swim_io/src/fs.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_io/src/lib.rs b/swim_utilities/swim_io/src/lib.rs
index 9bc060874..cab071927 100644
--- a/swim_utilities/swim_io/src/lib.rs
+++ b/swim_utilities/swim_io/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_iteratee/Cargo.toml b/swim_utilities/swim_iteratee/Cargo.toml
index 360080e4a..7ff59c1e5 100644
--- a/swim_utilities/swim_iteratee/Cargo.toml
+++ b/swim_utilities/swim_iteratee/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_iteratee"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_iteratee/src/lib.rs b/swim_utilities/swim_iteratee/src/lib.rs
index e3e14674e..43b7dbf01 100644
--- a/swim_utilities/swim_iteratee/src/lib.rs
+++ b/swim_utilities/swim_iteratee/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_lrucache/Cargo.toml b/swim_utilities/swim_lrucache/Cargo.toml
index ff36f45b9..6bd5426c4 100644
--- a/swim_utilities/swim_lrucache/Cargo.toml
+++ b/swim_utilities/swim_lrucache/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_lrucache"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_lrucache/src/lib.rs b/swim_utilities/swim_lrucache/src/lib.rs
index 65945e4f6..459bc2f31 100644
--- a/swim_utilities/swim_lrucache/src/lib.rs
+++ b/swim_utilities/swim_lrucache/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_lrucache/src/lru_cache/mod.rs b/swim_utilities/swim_lrucache/src/lru_cache/mod.rs
index 4c38afadb..12754d2cc 100644
--- a/swim_utilities/swim_lrucache/src/lru_cache/mod.rs
+++ b/swim_utilities/swim_lrucache/src/lru_cache/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_route/Cargo.toml b/swim_utilities/swim_route/Cargo.toml
index 2f0e019cd..3b5904c63 100644
--- a/swim_utilities/swim_route/Cargo.toml
+++ b/swim_utilities/swim_route/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_route"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_route/src/lib.rs b/swim_utilities/swim_route/src/lib.rs
index b04b96a9b..7442ec8c1 100644
--- a/swim_utilities/swim_route/src/lib.rs
+++ b/swim_utilities/swim_route/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_route/src/route_pattern/mod.rs b/swim_utilities/swim_route/src/route_pattern/mod.rs
index 75a5f7d25..e1412f835 100644
--- a/swim_utilities/swim_route/src/route_pattern/mod.rs
+++ b/swim_utilities/swim_route/src/route_pattern/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_route/src/uri/mod.rs b/swim_utilities/swim_route/src/uri/mod.rs
index 6746b6efc..9767dd800 100644
--- a/swim_utilities/swim_route/src/uri/mod.rs
+++ b/swim_utilities/swim_route/src/uri/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_rtree/Cargo.toml b/swim_utilities/swim_rtree/Cargo.toml
index 84e654e38..6f406b54e 100644
--- a/swim_utilities/swim_rtree/Cargo.toml
+++ b/swim_utilities/swim_rtree/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_rtree"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_rtree/src/lib.rs b/swim_utilities/swim_rtree/src/lib.rs
index 00c045a89..482f91989 100644
--- a/swim_utilities/swim_rtree/src/lib.rs
+++ b/swim_utilities/swim_rtree/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_rtree/src/rectangles.rs b/swim_utilities/swim_rtree/src/rectangles.rs
index c15a0d5a3..180c7c9e8 100644
--- a/swim_utilities/swim_rtree/src/rectangles.rs
+++ b/swim_utilities/swim_rtree/src/rectangles.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_rtree/src/strategies.rs b/swim_utilities/swim_rtree/src/strategies.rs
index 5fbb1c002..4a5f9ac44 100644
--- a/swim_utilities/swim_rtree/src/strategies.rs
+++ b/swim_utilities/swim_rtree/src/strategies.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_sync/Cargo.toml b/swim_utilities/swim_sync/Cargo.toml
index 390ee9788..23f2470fe 100644
--- a/swim_utilities/swim_sync/Cargo.toml
+++ b/swim_utilities/swim_sync/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_sync"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [features]
diff --git a/swim_utilities/swim_sync/src/circular_buffer/mod.rs b/swim_utilities/swim_sync/src/circular_buffer/mod.rs
index 2c26f5d82..7c04f28ee 100644
--- a/swim_utilities/swim_sync/src/circular_buffer/mod.rs
+++ b/swim_utilities/swim_sync/src/circular_buffer/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_sync/src/lib.rs b/swim_utilities/swim_sync/src/lib.rs
index 98431b80f..2f16db568 100644
--- a/swim_utilities/swim_sync/src/lib.rs
+++ b/swim_utilities/swim_sync/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_sync/src/rwlock/mod.rs b/swim_utilities/swim_sync/src/rwlock/mod.rs
index bda8c8647..bbd35697b 100644
--- a/swim_utilities/swim_sync/src/rwlock/mod.rs
+++ b/swim_utilities/swim_sync/src/rwlock/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_sync/src/topic/mod.rs b/swim_utilities/swim_sync/src/topic/mod.rs
index 9ba181767..f2cbe74b3 100644
--- a/swim_utilities/swim_sync/src/topic/mod.rs
+++ b/swim_utilities/swim_sync/src/topic/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_sync/src/waiters.rs b/swim_utilities/swim_sync/src/waiters.rs
index 45e11b0a8..2b1f46791 100644
--- a/swim_utilities/swim_sync/src/waiters.rs
+++ b/swim_utilities/swim_sync/src/waiters.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_time/Cargo.toml b/swim_utilities/swim_time/Cargo.toml
index 0fc7b42c1..793e67ffe 100644
--- a/swim_utilities/swim_time/Cargo.toml
+++ b/swim_utilities/swim_time/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_time"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_time/src/instant/mod.rs b/swim_utilities/swim_time/src/instant/mod.rs
index 06b8024ec..407ccc62d 100644
--- a/swim_utilities/swim_time/src/instant/mod.rs
+++ b/swim_utilities/swim_time/src/instant/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_time/src/lib.rs b/swim_utilities/swim_time/src/lib.rs
index 0e1cf1c05..f91bd273e 100644
--- a/swim_utilities/swim_time/src/lib.rs
+++ b/swim_utilities/swim_time/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_tracing/Cargo.toml b/swim_utilities/swim_tracing/Cargo.toml
index 62540aa60..bc35430b9 100644
--- a/swim_utilities/swim_tracing/Cargo.toml
+++ b/swim_utilities/swim_tracing/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_tracing"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [features]
diff --git a/swim_utilities/swim_tracing/src/lib.rs b/swim_utilities/swim_tracing/src/lib.rs
index f4e2e4a78..94951ff08 100644
--- a/swim_utilities/swim_tracing/src/lib.rs
+++ b/swim_utilities/swim_tracing/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_tracing/src/request.rs b/swim_utilities/swim_tracing/src/request.rs
index 915822512..6a3008bee 100644
--- a/swim_utilities/swim_tracing/src/request.rs
+++ b/swim_utilities/swim_tracing/src/request.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_trigger/Cargo.toml b/swim_utilities/swim_trigger/Cargo.toml
index 10d1a3993..1f7f9df6d 100644
--- a/swim_utilities/swim_trigger/Cargo.toml
+++ b/swim_utilities/swim_trigger/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_trigger"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_trigger/src/lib.rs b/swim_utilities/swim_trigger/src/lib.rs
index e2b54ed34..5307b60e0 100644
--- a/swim_utilities/swim_trigger/src/lib.rs
+++ b/swim_utilities/swim_trigger/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_trigger/src/promise/mod.rs b/swim_utilities/swim_trigger/src/promise/mod.rs
index 11d33288e..de2236986 100644
--- a/swim_utilities/swim_trigger/src/promise/mod.rs
+++ b/swim_utilities/swim_trigger/src/promise/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_warp/Cargo.toml b/swim_warp/Cargo.toml
index 2bd20d53c..c7fc63458 100644
--- a/swim_warp/Cargo.toml
+++ b/swim_warp/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_warp"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_warp/src/envelope/mod.rs b/swim_warp/src/envelope/mod.rs
index a97c21279..9c733fc6f 100644
--- a/swim_warp/src/envelope/mod.rs
+++ b/swim_warp/src/envelope/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_warp/src/lib.rs b/swim_warp/src/lib.rs
index 84d59383a..e3228ead7 100644
--- a/swim_warp/src/lib.rs
+++ b/swim_warp/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_warp/src/map.rs b/swim_warp/src/map.rs
index 69112a502..bb82be063 100644
--- a/swim_warp/src/map.rs
+++ b/swim_warp/src/map.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.


Test patch:
diff --git a/api/formats/swim_msgpack/src/reader/tests.rs b/api/formats/swim_msgpack/src/reader/tests.rs
index 738c9e412..0d2993ea9 100644
--- a/api/formats/swim_msgpack/src/reader/tests.rs
+++ b/api/formats/swim_msgpack/src/reader/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_msgpack/src/tests.rs b/api/formats/swim_msgpack/src/tests.rs
index 76a9970d6..00bc11f1d 100644
--- a/api/formats/swim_msgpack/src/tests.rs
+++ b/api/formats/swim_msgpack/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_msgpack/src/writer/tests.rs b/api/formats/swim_msgpack/src/writer/tests.rs
index 5c53186bd..df472e51b 100644
--- a/api/formats/swim_msgpack/src/writer/tests.rs
+++ b/api/formats/swim_msgpack/src/writer/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/parser/async_parser/tests.rs b/api/formats/swim_recon/src/parser/async_parser/tests.rs
index 379ecb31e..cbc5e3960 100644
--- a/api/formats/swim_recon/src/parser/async_parser/tests.rs
+++ b/api/formats/swim_recon/src/parser/async_parser/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/parser/tests.rs b/api/formats/swim_recon/src/parser/tests.rs
index 2c55c443a..2f98f7e1c 100644
--- a/api/formats/swim_recon/src/parser/tests.rs
+++ b/api/formats/swim_recon/src/parser/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/src/printer/tests.rs b/api/formats/swim_recon/src/printer/tests.rs
index 675325cd0..fa05abfe2 100644
--- a/api/formats/swim_recon/src/printer/tests.rs
+++ b/api/formats/swim_recon/src/printer/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/formats/swim_recon/tests/derivereadable.rs b/api/formats/swim_recon/tests/derivereadable.rs
index 2d16ffb37..ccb867367 100644
--- a/api/formats/swim_recon/tests/derivereadable.rs
+++ b/api/formats/swim_recon/tests/derivereadable.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/bridge/tests.rs b/api/swim_form/src/structural/bridge/tests.rs
index e87855686..6a98c32ef 100644
--- a/api/swim_form/src/structural/bridge/tests.rs
+++ b/api/swim_form/src/structural/bridge/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/error/tests.rs b/api/swim_form/src/structural/read/error/tests.rs
index d842d6ead..e5ba34587 100644
--- a/api/swim_form/src/structural/read/error/tests.rs
+++ b/api/swim_form/src/structural/read/error/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/from_model/tests.rs b/api/swim_form/src/structural/read/from_model/tests.rs
index 0213be387..0999b5daa 100644
--- a/api/swim_form/src/structural/read/from_model/tests.rs
+++ b/api/swim_form/src/structural/read/from_model/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/read/recognizer/tests.rs b/api/swim_form/src/structural/read/recognizer/tests.rs
index 0908ee55d..559d7207f 100644
--- a/api/swim_form/src/structural/read/recognizer/tests.rs
+++ b/api/swim_form/src/structural/read/recognizer/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/tests/mod.rs b/api/swim_form/src/structural/tests/mod.rs
index e4b0d401a..e9a82a6b1 100644
--- a/api/swim_form/src/structural/tests/mod.rs
+++ b/api/swim_form/src/structural/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/write/tests.rs b/api/swim_form/src/structural/write/tests.rs
index d4ef5f207..edab8c6fa 100644
--- a/api/swim_form/src/structural/write/tests.rs
+++ b/api/swim_form/src/structural/write/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/structural/write/to_model/tests.rs b/api/swim_form/src/structural/write/to_model/tests.rs
index d4c3349a2..45da4a7a0 100644
--- a/api/swim_form/src/structural/write/to_model/tests.rs
+++ b/api/swim_form/src/structural/write/to_model/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/double_body_attr.rs b/api/swim_form/src/tests/derive/form/double_body_attr.rs
index ce6fbf0e6..266055b06 100644
--- a/api/swim_form/src/tests/derive/form/double_body_attr.rs
+++ b/api/swim_form/src/tests/derive/form/double_body_attr.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/double_header_body_attr.rs b/api/swim_form/src/tests/derive/form/double_header_body_attr.rs
index 1454fef65..8738267d3 100644
--- a/api/swim_form/src/tests/derive/form/double_header_body_attr.rs
+++ b/api/swim_form/src/tests/derive/form/double_header_body_attr.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/double_kind.rs b/api/swim_form/src/tests/derive/form/double_kind.rs
index 729c7de96..d5c56088b 100644
--- a/api/swim_form/src/tests/derive/form/double_kind.rs
+++ b/api/swim_form/src/tests/derive/form/double_kind.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/empty_tag.rs b/api/swim_form/src/tests/derive/form/empty_tag.rs
index 13c25e8b6..8cf510c5e 100644
--- a/api/swim_form/src/tests/derive/form/empty_tag.rs
+++ b/api/swim_form/src/tests/derive/form/empty_tag.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/generic.rs b/api/swim_form/src/tests/derive/form/generic.rs
index dbceff906..21686a34c 100644
--- a/api/swim_form/src/tests/derive/form/generic.rs
+++ b/api/swim_form/src/tests/derive/form/generic.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/generic_no_default.rs b/api/swim_form/src/tests/derive/form/generic_no_default.rs
index 7d1810e3d..d54c0f1d9 100644
--- a/api/swim_form/src/tests/derive/form/generic_no_default.rs
+++ b/api/swim_form/src/tests/derive/form/generic_no_default.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/incorrect_rename_type.rs b/api/swim_form/src/tests/derive/form/incorrect_rename_type.rs
index 9541dfd5a..332c2570c 100644
--- a/api/swim_form/src/tests/derive/form/incorrect_rename_type.rs
+++ b/api/swim_form/src/tests/derive/form/incorrect_rename_type.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/incorrect_tag_type.rs b/api/swim_form/src/tests/derive/form/incorrect_tag_type.rs
index 048d94b31..2587d2bcf 100644
--- a/api/swim_form/src/tests/derive/form/incorrect_tag_type.rs
+++ b/api/swim_form/src/tests/derive/form/incorrect_tag_type.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/incorrect_tag_type_enum.rs b/api/swim_form/src/tests/derive/form/incorrect_tag_type_enum.rs
index 32abaebb2..1e4a20e49 100644
--- a/api/swim_form/src/tests/derive/form/incorrect_tag_type_enum.rs
+++ b/api/swim_form/src/tests/derive/form/incorrect_tag_type_enum.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/invalid_tag_placement_enum.rs b/api/swim_form/src/tests/derive/form/invalid_tag_placement_enum.rs
index 7383529f6..5a1f9d3e5 100644
--- a/api/swim_form/src/tests/derive/form/invalid_tag_placement_enum.rs
+++ b/api/swim_form/src/tests/derive/form/invalid_tag_placement_enum.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/tag_enum.rs b/api/swim_form/src/tests/derive/form/tag_enum.rs
index b87167965..cf0f280d9 100644
--- a/api/swim_form/src/tests/derive/form/tag_enum.rs
+++ b/api/swim_form/src/tests/derive/form/tag_enum.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/tag_no_to_string.rs b/api/swim_form/src/tests/derive/form/tag_no_to_string.rs
index 582e1c330..76e7d5ac3 100644
--- a/api/swim_form/src/tests/derive/form/tag_no_to_string.rs
+++ b/api/swim_form/src/tests/derive/form/tag_no_to_string.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/union.rs b/api/swim_form/src/tests/derive/form/union.rs
index 5ef3b82c5..d9b282050 100644
--- a/api/swim_form/src/tests/derive/form/union.rs
+++ b/api/swim_form/src/tests/derive/form/union.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/unknown_container_attr.rs b/api/swim_form/src/tests/derive/form/unknown_container_attr.rs
index 4acf65a6f..b12bdb774 100644
--- a/api/swim_form/src/tests/derive/form/unknown_container_attr.rs
+++ b/api/swim_form/src/tests/derive/form/unknown_container_attr.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/form/unknown_field_attr.rs b/api/swim_form/src/tests/derive/form/unknown_field_attr.rs
index d09f1915f..5f0118cd9 100644
--- a/api/swim_form/src/tests/derive/form/unknown_field_attr.rs
+++ b/api/swim_form/src/tests/derive/form/unknown_field_attr.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/tag/fields.rs b/api/swim_form/src/tests/derive/tag/fields.rs
index b25cc2197..cdc059ede 100644
--- a/api/swim_form/src/tests/derive/tag/fields.rs
+++ b/api/swim_form/src/tests/derive/tag/fields.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/derive/tag/not_enum.rs b/api/swim_form/src/tests/derive/tag/not_enum.rs
index b4c0ec71e..8c3736c74 100644
--- a/api/swim_form/src/tests/derive/tag/not_enum.rs
+++ b/api/swim_form/src/tests/derive/tag/not_enum.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/enumeration.rs b/api/swim_form/src/tests/enumeration.rs
index e367872f8..0c35d8370 100644
--- a/api/swim_form/src/tests/enumeration.rs
+++ b/api/swim_form/src/tests/enumeration.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/impls.rs b/api/swim_form/src/tests/impls.rs
index 661a31d31..ea344d3e4 100644
--- a/api/swim_form/src/tests/impls.rs
+++ b/api/swim_form/src/tests/impls.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/mod.rs b/api/swim_form/src/tests/mod.rs
index 3989d34bb..c4ce4d4cf 100644
--- a/api/swim_form/src/tests/mod.rs
+++ b/api/swim_form/src/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/src/tests/structure.rs b/api/swim_form/src/tests/structure.rs
index 49bc647b0..0090a94ad 100644
--- a/api/swim_form/src/tests/structure.rs
+++ b/api/swim_form/src/tests/structure.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/tests/derivetag.rs b/api/swim_form/tests/derivetag.rs
index a9b7659cf..ae99a5394 100644
--- a/api/swim_form/tests/derivetag.rs
+++ b/api/swim_form/tests/derivetag.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_form/tests/derivewritable.rs b/api/swim_form/tests/derivewritable.rs
index e68558581..6a92f8429 100644
--- a/api/swim_form/tests/derivewritable.rs
+++ b/api/swim_form/tests/derivewritable.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/tests/coercion.rs b/api/swim_model/src/tests/coercion.rs
index cc72b0cf3..a8c7ca504 100644
--- a/api/swim_model/src/tests/coercion.rs
+++ b/api/swim_model/src/tests/coercion.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/tests/mod.rs b/api/swim_model/src/tests/mod.rs
index 21b977a61..8c5137098 100644
--- a/api/swim_model/src/tests/mod.rs
+++ b/api/swim_model/src/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_model/src/text/tests.rs b/api/swim_model/src/text/tests.rs
index e1e1d5da3..265bdb857 100644
--- a/api/swim_model/src/text/tests.rs
+++ b/api/swim_model/src/text/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/mod.rs b/api/swim_schema/src/schema/tests/derive/mod.rs
index 8d30b975d..1a95f9553 100644
--- a/api/swim_schema/src/schema/tests/derive/mod.rs
+++ b/api/swim_schema/src/schema/tests/derive/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/all_items_op_arg_count.rs b/api/swim_schema/src/schema/tests/derive/validated_form/all_items_op_arg_count.rs
index 1f2ebfe2d..3113b8fec 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/all_items_op_arg_count.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/all_items_op_arg_count.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/all_items_skipped.rs b/api/swim_schema/src/schema/tests/derive/validated_form/all_items_skipped.rs
index 14a1b206e..d47694e3b 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/all_items_skipped.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/all_items_skipped.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/all_items_unit.rs b/api/swim_schema/src/schema/tests/derive/validated_form/all_items_unit.rs
index acf8a5e10..0b704695e 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/all_items_unit.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/all_items_unit.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/and_op_arg_count.rs b/api/swim_schema/src/schema/tests/derive/validated_form/and_op_arg_count.rs
index f3d75b23a..ab02e1be9 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/and_op_arg_count.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/and_op_arg_count.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/enum_body_with_schema.rs b/api/swim_schema/src/schema/tests/derive/validated_form/enum_body_with_schema.rs
index 1d89708ba..6698bfcef 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/enum_body_with_schema.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/enum_body_with_schema.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/generic_no_default.rs b/api/swim_schema/src/schema/tests/derive/validated_form/generic_no_default.rs
index 81ff68eb9..945b5b077 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/generic_no_default.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/generic_no_default.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 use swim_form::Form;
-use swim_schema::ValueSchema;
 use swim_model::ValueKind;
+use swim_schema::ValueSchema;
 
 fn main() {
     struct Invalid;
diff --git a/api/swim_schema/src/schema/tests/derive/validated_form/invalid_container_of_kind.rs b/api/swim_schema/src/schema/tests/derive/validated_form/invalid_container_of_kind.rs
index 91a832306..b19625b86 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/invalid_container_of_kind.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/invalid_container_of_kind.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use swim_schema::ValueSchema;
 use swim_model::ValueKind;
+use swim_schema::ValueSchema;
 
 fn main() {
     #[derive(ValueSchema)]
diff --git a/api/swim_schema/src/schema/tests/derive/validated_form/invalid_range.rs b/api/swim_schema/src/schema/tests/derive/validated_form/invalid_range.rs
index 6b6bb8d83..235d13bf1 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/invalid_range.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/invalid_range.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/not_op_arg_count.rs b/api/swim_schema/src/schema/tests/derive/validated_form/not_op_arg_count.rs
index 6eb8e1f87..74e19cf59 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/not_op_arg_count.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/not_op_arg_count.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/nothing_attr_on_field.rs b/api/swim_schema/src/schema/tests/derive/validated_form/nothing_attr_on_field.rs
index 380ba7d59..f60384f8d 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/nothing_attr_on_field.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/nothing_attr_on_field.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/or_op_arg_count.rs b/api/swim_schema/src/schema/tests/derive/validated_form/or_op_arg_count.rs
index a45b7ab52..cfb8e05bd 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/or_op_arg_count.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/or_op_arg_count.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/schema_skipped_field.rs b/api/swim_schema/src/schema/tests/derive/validated_form/schema_skipped_field.rs
index b881db5a2..cdcb03699 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/schema_skipped_field.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/schema_skipped_field.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/struct_body_with_schema.rs b/api/swim_schema/src/schema/tests/derive/validated_form/struct_body_with_schema.rs
index 2615b2133..bc6b0d6f8 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/struct_body_with_schema.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/struct_body_with_schema.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/schema/tests/derive/validated_form/trailing_schema.rs b/api/swim_schema/src/schema/tests/derive/validated_form/trailing_schema.rs
index 3a4e0364b..581a60e0f 100644
--- a/api/swim_schema/src/schema/tests/derive/validated_form/trailing_schema.rs
+++ b/api/swim_schema/src/schema/tests/derive/validated_form/trailing_schema.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use swim_schema::ValueSchema;
 use swim_model::Value;
+use swim_schema::ValueSchema;
 
 fn main() {
     #[derive(ValueSchema)]
diff --git a/api/swim_schema/src/schema/tests/mod.rs b/api/swim_schema/src/schema/tests/mod.rs
index 5cf5a6af5..7622eb9fd 100644
--- a/api/swim_schema/src/schema/tests/mod.rs
+++ b/api/swim_schema/src/schema/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/api/swim_schema/src/tests.rs b/api/swim_schema/src/tests.rs
index 5d6f3b1a2..719e54052 100644
--- a/api/swim_schema/src/tests.rs
+++ b/api/swim_schema/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/container.rs b/macro_utilities/stringify_attr/src/tests/derive/container.rs
index 12e701aec..766dabf55 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/container.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/container.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/container2.rs b/macro_utilities/stringify_attr/src/tests/derive/container2.rs
index 04ef656bf..3dd7938dc 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/container2.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/container2.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/container3.rs b/macro_utilities/stringify_attr/src/tests/derive/container3.rs
index 770867335..7a546baf8 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/container3.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/container3.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/extra_attr.rs b/macro_utilities/stringify_attr/src/tests/derive/extra_attr.rs
index 008ae910f..7edfe629d 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/extra_attr.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/extra_attr.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/extra_attr2.rs b/macro_utilities/stringify_attr/src/tests/derive/extra_attr2.rs
index bb90088b0..4db63d4c9 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/extra_attr2.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/extra_attr2.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/extra_attr3.rs b/macro_utilities/stringify_attr/src/tests/derive/extra_attr3.rs
index 026555dbf..b59216365 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/extra_attr3.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/extra_attr3.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/invalid_list.rs b/macro_utilities/stringify_attr/src/tests/derive/invalid_list.rs
index 972af8581..245f9f38b 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/invalid_list.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/invalid_list.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/invalid_path.rs b/macro_utilities/stringify_attr/src/tests/derive/invalid_path.rs
index 3c6aa7eb2..c37c84e81 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/invalid_path.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/invalid_path.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/invalid_raw_list.rs b/macro_utilities/stringify_attr/src/tests/derive/invalid_raw_list.rs
index d5c8db95a..65a155e90 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/invalid_raw_list.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/invalid_raw_list.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/no_attrs.rs b/macro_utilities/stringify_attr/src/tests/derive/no_attrs.rs
index 7ffc991fd..1370f3a1e 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/no_attrs.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/no_attrs.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/raw_extra_attr.rs b/macro_utilities/stringify_attr/src/tests/derive/raw_extra_attr.rs
index 26b4eb0ee..738950d91 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/raw_extra_attr.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/raw_extra_attr.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/raw_extra_attr2.rs b/macro_utilities/stringify_attr/src/tests/derive/raw_extra_attr2.rs
index 9dde6effb..5a2be0f88 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/raw_extra_attr2.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/raw_extra_attr2.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/raw_missing_input.rs b/macro_utilities/stringify_attr/src/tests/derive/raw_missing_input.rs
index f52a1aa83..1abfcba26 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/raw_missing_input.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/raw_missing_input.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/raw_missing_path.rs b/macro_utilities/stringify_attr/src/tests/derive/raw_missing_path.rs
index 32007c37e..f3c5021c9 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/raw_missing_path.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/raw_missing_path.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/raw_missing_raw.rs b/macro_utilities/stringify_attr/src/tests/derive/raw_missing_raw.rs
index a11bf2ead..369a3d9d7 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/raw_missing_raw.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/raw_missing_raw.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/raw_no_attrs.rs b/macro_utilities/stringify_attr/src/tests/derive/raw_no_attrs.rs
index cbf95425f..6307cd949 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/raw_no_attrs.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/raw_no_attrs.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/derive/union.rs b/macro_utilities/stringify_attr/src/tests/derive/union.rs
index 3818fd5c2..9b338dc23 100644
--- a/macro_utilities/stringify_attr/src/tests/derive/union.rs
+++ b/macro_utilities/stringify_attr/src/tests/derive/union.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/macro_utilities/stringify_attr/src/tests/mod.rs b/macro_utilities/stringify_attr/src/tests/mod.rs
index 10c795ca6..adbf91163 100644
--- a/macro_utilities/stringify_attr/src/tests/mod.rs
+++ b/macro_utilities/stringify_attr/src/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/framed/tests.rs b/ratchet/ratchet_core/src/framed/tests.rs
index e19bf7acc..e2c1110b4 100644
--- a/ratchet/ratchet_core/src/framed/tests.rs
+++ b/ratchet/ratchet_core/src/framed/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/client/tests.rs b/ratchet/ratchet_core/src/handshake/client/tests.rs
index 648da839b..3f7750de0 100644
--- a/ratchet/ratchet_core/src/handshake/client/tests.rs
+++ b/ratchet/ratchet_core/src/handshake/client/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/server/tests.rs b/ratchet/ratchet_core/src/handshake/server/tests.rs
index b2f4bf84c..14a9ea8e7 100644
--- a/ratchet/ratchet_core/src/handshake/server/tests.rs
+++ b/ratchet/ratchet_core/src/handshake/server/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/handshake/tests.rs b/ratchet/ratchet_core/src/handshake/tests.rs
index 9a27d2c86..121e5914e 100644
--- a/ratchet/ratchet_core/src/handshake/tests.rs
+++ b/ratchet/ratchet_core/src/handshake/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/protocol/tests.rs b/ratchet/ratchet_core/src/protocol/tests.rs
index abaad7d9b..3e8a3861e 100644
--- a/ratchet/ratchet_core/src/protocol/tests.rs
+++ b/ratchet/ratchet_core/src/protocol/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/split/bilock/tests.rs b/ratchet/ratchet_core/src/split/bilock/tests.rs
index 8a37ebe2d..c94f55598 100644
--- a/ratchet/ratchet_core/src/split/bilock/tests.rs
+++ b/ratchet/ratchet_core/src/split/bilock/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/split/tests.rs b/ratchet/ratchet_core/src/split/tests.rs
index ee1ad3368..8de46b970 100644
--- a/ratchet/ratchet_core/src/split/tests.rs
+++ b/ratchet/ratchet_core/src/split/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_core/src/test_fixture/mod.rs b/ratchet/ratchet_core/src/test_fixture/mod.rs
index 3ae000b2c..54b559e05 100644
--- a/ratchet/ratchet_core/src/test_fixture/mod.rs
+++ b/ratchet/ratchet_core/src/test_fixture/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/ratchet/ratchet_deflate/src/tests.rs b/ratchet/ratchet_deflate/src/tests.rs
index fef88874b..495e0af2e 100644
--- a/ratchet/ratchet_deflate/src/tests.rs
+++ b/ratchet/ratchet_deflate/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/backpressure/keyed/map/tests.rs b/runtime/swim_runtime/src/backpressure/keyed/map/tests.rs
index dcbfb7f79..f19794c44 100644
--- a/runtime/swim_runtime/src/backpressure/keyed/map/tests.rs
+++ b/runtime/swim_runtime/src/backpressure/keyed/map/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/backpressure/keyed/tests.rs b/runtime/swim_runtime/src/backpressure/keyed/tests.rs
index 9e338dbc4..50d27f949 100644
--- a/runtime/swim_runtime/src/backpressure/keyed/tests.rs
+++ b/runtime/swim_runtime/src/backpressure/keyed/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/backpressure/test.rs b/runtime/swim_runtime/src/backpressure/test.rs
index e1883f9c0..51f21776c 100644
--- a/runtime/swim_runtime/src/backpressure/test.rs
+++ b/runtime/swim_runtime/src/backpressure/test.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/error/tests.rs b/runtime/swim_runtime/src/error/tests.rs
index 6ff5785cd..56539992a 100644
--- a/runtime/swim_runtime/src/error/tests.rs
+++ b/runtime/swim_runtime/src/error/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/pending/tests.rs b/runtime/swim_runtime/src/remote/pending/tests.rs
index 04f78a52b..dff7ee05f 100644
--- a/runtime/swim_runtime/src/remote/pending/tests.rs
+++ b/runtime/swim_runtime/src/remote/pending/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/router/tests.rs b/runtime/swim_runtime/src/remote/router/tests.rs
index 6b42d7242..6290568c3 100644
--- a/runtime/swim_runtime/src/remote/router/tests.rs
+++ b/runtime/swim_runtime/src/remote/router/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/state/tests.rs b/runtime/swim_runtime/src/remote/state/tests.rs
index f9dfc002a..4254a1919 100644
--- a/runtime/swim_runtime/src/remote/state/tests.rs
+++ b/runtime/swim_runtime/src/remote/state/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/table/tests.rs b/runtime/swim_runtime/src/remote/table/tests.rs
index 058001727..e3d0bad40 100644
--- a/runtime/swim_runtime/src/remote/table/tests.rs
+++ b/runtime/swim_runtime/src/remote/table/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/task/tests.rs b/runtime/swim_runtime/src/remote/task/tests.rs
index f9d2f1dd6..457a7b412 100644
--- a/runtime/swim_runtime/src/remote/task/tests.rs
+++ b/runtime/swim_runtime/src/remote/task/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/test_fixture/connections.rs b/runtime/swim_runtime/src/remote/test_fixture/connections.rs
index e45ae56c6..96c37d476 100644
--- a/runtime/swim_runtime/src/remote/test_fixture/connections.rs
+++ b/runtime/swim_runtime/src/remote/test_fixture/connections.rs
@@ -1,3 +1,17 @@
+// Copyright 2015-2021 Swim Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use crate::error::ConnectionError;
 use crate::remote::table::SchemeHostPort;
 use crate::remote::{ExternalConnections, Listener, Scheme, SchemeSocketAddr};
diff --git a/runtime/swim_runtime/src/remote/test_fixture/mod.rs b/runtime/swim_runtime/src/remote/test_fixture/mod.rs
index 631d50eaf..ea6cb3827 100644
--- a/runtime/swim_runtime/src/remote/test_fixture/mod.rs
+++ b/runtime/swim_runtime/src/remote/test_fixture/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/remote/tests.rs b/runtime/swim_runtime/src/remote/tests.rs
index e9987bfe0..51057ed17 100644
--- a/runtime/swim_runtime/src/remote/tests.rs
+++ b/runtime/swim_runtime/src/remote/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/runtime/swim_runtime/src/tests.rs b/runtime/swim_runtime/src/tests.rs
index 2ce68e1d2..f2e8a5db0 100644
--- a/runtime/swim_runtime/src/tests.rs
+++ b/runtime/swim_runtime/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/transaction/frame_mask/tests.rs b/stm/src/transaction/frame_mask/tests.rs
index dfb72db43..d03862825 100644
--- a/stm/src/transaction/frame_mask/tests.rs
+++ b/stm/src/transaction/frame_mask/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/transaction/tests.rs b/stm/src/transaction/tests.rs
index 6222adf19..0eca09650 100644
--- a/stm/src/transaction/tests.rs
+++ b/stm/src/transaction/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/stm/src/var/tests.rs b/stm/src/var/tests.rs
index 4b41c354d..d60084c2d 100644
--- a/stm/src/var/tests.rs
+++ b/stm/src/var/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/configuration/tests/mod.rs b/swim_client/src/configuration/tests/mod.rs
index 7aef4f0d3..8fa8ab6fd 100644
--- a/swim_client/src/configuration/tests/mod.rs
+++ b/swim_client/src/configuration/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/connections/tests.rs b/swim_client/src/connections/tests.rs
index b0ff697b7..a604dc237 100644
--- a/swim_client/src/connections/tests.rs
+++ b/swim_client/src/connections/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/error/tests.rs b/swim_client/src/downlink/error/tests.rs
index 0235a6d72..23bd80506 100644
--- a/swim_client/src/downlink/error/tests.rs
+++ b/swim_client/src/downlink/error/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/model/map/tests.rs b/swim_client/src/downlink/model/map/tests.rs
index 9cd9349f4..30a8d125b 100644
--- a/swim_client/src/downlink/model/map/tests.rs
+++ b/swim_client/src/downlink/model/map/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/command/tests/mod.rs b/swim_client/src/downlink/state_machine/command/tests/mod.rs
index 89e13993c..6a676bfaf 100644
--- a/swim_client/src/downlink/state_machine/command/tests/mod.rs
+++ b/swim_client/src/downlink/state_machine/command/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/event/tests/mod.rs b/swim_client/src/downlink/state_machine/event/tests/mod.rs
index 6a85a926f..47a3a6db9 100644
--- a/swim_client/src/downlink/state_machine/event/tests/mod.rs
+++ b/swim_client/src/downlink/state_machine/event/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/map/tests/mod.rs b/swim_client/src/downlink/state_machine/map/tests/mod.rs
index c296d0705..e16858a7e 100644
--- a/swim_client/src/downlink/state_machine/map/tests/mod.rs
+++ b/swim_client/src/downlink/state_machine/map/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/state_machine/value/tests.rs b/swim_client/src/downlink/state_machine/value/tests.rs
index d981585c1..96deac6f2 100644
--- a/swim_client/src/downlink/state_machine/value/tests.rs
+++ b/swim_client/src/downlink/state_machine/value/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/subscription/envelopes/tests.rs b/swim_client/src/downlink/subscription/envelopes/tests.rs
index 020b77ee2..222341715 100644
--- a/swim_client/src/downlink/subscription/envelopes/tests.rs
+++ b/swim_client/src/downlink/subscription/envelopes/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/subscription/tests.rs b/swim_client/src/downlink/subscription/tests.rs
index f3aa66cb5..424ddf793 100644
--- a/swim_client/src/downlink/subscription/tests.rs
+++ b/swim_client/src/downlink/subscription/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/subscription/watch_adapter/tests.rs b/swim_client/src/downlink/subscription/watch_adapter/tests.rs
index ef1729d1c..6d9a0039e 100644
--- a/swim_client/src/downlink/subscription/watch_adapter/tests.rs
+++ b/swim_client/src/downlink/subscription/watch_adapter/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/tests.rs b/swim_client/src/downlink/tests.rs
index f27a37909..3aba7d910 100644
--- a/swim_client/src/downlink/tests.rs
+++ b/swim_client/src/downlink/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/command/tests.rs b/swim_client/src/downlink/typed/command/tests.rs
index 8effc13b2..b6d77fbfd 100644
--- a/swim_client/src/downlink/typed/command/tests.rs
+++ b/swim_client/src/downlink/typed/command/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/event/tests.rs b/swim_client/src/downlink/typed/event/tests.rs
index 99da5bc43..c451f5577 100644
--- a/swim_client/src/downlink/typed/event/tests.rs
+++ b/swim_client/src/downlink/typed/event/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/map/tests.rs b/swim_client/src/downlink/typed/map/tests.rs
index a9a8eec91..3fbe049a3 100644
--- a/swim_client/src/downlink/typed/map/tests.rs
+++ b/swim_client/src/downlink/typed/map/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/downlink/typed/value/tests.rs b/swim_client/src/downlink/typed/value/tests.rs
index 0cf55cce4..ed63d4e81 100644
--- a/swim_client/src/downlink/typed/value/tests.rs
+++ b/swim_client/src/downlink/typed/value/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/src/router/tests.rs b/swim_client/src/router/tests.rs
index eb643fe76..8c0b149fa 100644
--- a/swim_client/src/router/tests.rs
+++ b/swim_client/src/router/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/test_server/Cargo.toml b/swim_client/test_server/Cargo.toml
index 6f5b78914..a049e5981 100644
--- a/swim_client/test_server/Cargo.toml
+++ b/swim_client/test_server/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "test_server"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_client/test_server/src/lib.rs b/swim_client/test_server/src/lib.rs
index ec9a9f49a..a2d3be08e 100644
--- a/swim_client/test_server/src/lib.rs
+++ b/swim_client/test_server/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_client/tests/interface.rs b/swim_client/tests/interface.rs
index 62823ab5c..a238af2ab 100644
--- a/swim_client/tests/interface.rs
+++ b/swim_client/tests/interface.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/model/map/tests.rs b/swim_server/server_store/src/agent/lane/model/map/tests.rs
index c292b6fac..a263827a0 100644
--- a/swim_server/server_store/src/agent/lane/model/map/tests.rs
+++ b/swim_server/server_store/src/agent/lane/model/map/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/model/value/tests.rs b/swim_server/server_store/src/agent/lane/model/value/tests.rs
index 76dcd84d5..6bab1b66a 100644
--- a/swim_server/server_store/src/agent/lane/model/value/tests.rs
+++ b/swim_server/server_store/src/agent/lane/model/value/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/server_store/src/agent/lane/tests.rs b/swim_server/server_store/src/agent/lane/tests.rs
index 7f9f8468a..406732338 100644
--- a/swim_server/server_store/src/agent/lane/tests.rs
+++ b/swim_server/server_store/src/agent/lane/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/context/tests.rs b/swim_server/src/agent/context/tests.rs
index e26b0f96f..e467e4965 100644
--- a/swim_server/src/agent/context/tests.rs
+++ b/swim_server/src/agent/context/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/dispatch/tests/mock.rs b/swim_server/src/agent/dispatch/tests/mock.rs
index b7e710c1a..d9b8b5f12 100644
--- a/swim_server/src/agent/dispatch/tests/mock.rs
+++ b/swim_server/src/agent/dispatch/tests/mock.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/dispatch/tests/mod.rs b/swim_server/src/agent/dispatch/tests/mod.rs
index ae9b1834f..ffc457e25 100644
--- a/swim_server/src/agent/dispatch/tests/mod.rs
+++ b/swim_server/src/agent/dispatch/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/task/tests.rs b/swim_server/src/agent/lane/channels/task/tests.rs
index 5176c6669..a63d48db5 100644
--- a/swim_server/src/agent/lane/channels/task/tests.rs
+++ b/swim_server/src/agent/lane/channels/task/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/action/tests.rs b/swim_server/src/agent/lane/channels/update/action/tests.rs
index 3d536b251..574427ce0 100644
--- a/swim_server/src/agent/lane/channels/update/action/tests.rs
+++ b/swim_server/src/agent/lane/channels/update/action/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/map/tests.rs b/swim_server/src/agent/lane/channels/update/map/tests.rs
index 7e9fc46c6..5884cd48c 100644
--- a/swim_server/src/agent/lane/channels/update/map/tests.rs
+++ b/swim_server/src/agent/lane/channels/update/map/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/tests.rs b/swim_server/src/agent/lane/channels/update/tests.rs
index c91396eda..11a52d77b 100644
--- a/swim_server/src/agent/lane/channels/update/tests.rs
+++ b/swim_server/src/agent/lane/channels/update/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/update/value/tests.rs b/swim_server/src/agent/lane/channels/update/value/tests.rs
index 042a2e9f8..ae8b46085 100644
--- a/swim_server/src/agent/lane/channels/update/value/tests.rs
+++ b/swim_server/src/agent/lane/channels/update/value/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/backpressure/tests.rs b/swim_server/src/agent/lane/channels/uplink/backpressure/tests.rs
index fb97fa429..1e39934f8 100644
--- a/swim_server/src/agent/lane/channels/uplink/backpressure/tests.rs
+++ b/swim_server/src/agent/lane/channels/uplink/backpressure/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/map/tests.rs b/swim_server/src/agent/lane/channels/uplink/map/tests.rs
index caa9d8222..c9f9b4f63 100644
--- a/swim_server/src/agent/lane/channels/uplink/map/tests.rs
+++ b/swim_server/src/agent/lane/channels/uplink/map/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/spawn/tests.rs b/swim_server/src/agent/lane/channels/uplink/spawn/tests.rs
index 3d247913d..8a4b2f84c 100644
--- a/swim_server/src/agent/lane/channels/uplink/spawn/tests.rs
+++ b/swim_server/src/agent/lane/channels/uplink/spawn/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/stateless/tests.rs b/swim_server/src/agent/lane/channels/uplink/stateless/tests.rs
index d6eee5639..1566fa0ad 100644
--- a/swim_server/src/agent/lane/channels/uplink/stateless/tests.rs
+++ b/swim_server/src/agent/lane/channels/uplink/stateless/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/channels/uplink/tests.rs b/swim_server/src/agent/lane/channels/uplink/tests.rs
index 83d37f476..582252ba8 100644
--- a/swim_server/src/agent/lane/channels/uplink/tests.rs
+++ b/swim_server/src/agent/lane/channels/uplink/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/lifecycle/tests.rs b/swim_server/src/agent/lane/lifecycle/tests.rs
index 8c462e793..a6f259114 100644
--- a/swim_server/src/agent/lane/lifecycle/tests.rs
+++ b/swim_server/src/agent/lane/lifecycle/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/action/tests.rs b/swim_server/src/agent/lane/model/action/tests.rs
index 724cafb16..997f8d469 100644
--- a/swim_server/src/agent/lane/model/action/tests.rs
+++ b/swim_server/src/agent/lane/model/action/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/command/tests.rs b/swim_server/src/agent/lane/model/command/tests.rs
index 1edc25d5f..4ef3d25ee 100644
--- a/swim_server/src/agent/lane/model/command/tests.rs
+++ b/swim_server/src/agent/lane/model/command/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/demand_map/tests.rs b/swim_server/src/agent/lane/model/demand_map/tests.rs
index c594e5211..48cdea36a 100644
--- a/swim_server/src/agent/lane/model/demand_map/tests.rs
+++ b/swim_server/src/agent/lane/model/demand_map/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/map/summary/tests.rs b/swim_server/src/agent/lane/model/map/summary/tests.rs
index 50f63e336..25234b42f 100644
--- a/swim_server/src/agent/lane/model/map/summary/tests.rs
+++ b/swim_server/src/agent/lane/model/map/summary/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/map/tests.rs b/swim_server/src/agent/lane/model/map/tests.rs
index c1e062aa8..52a7f5c86 100644
--- a/swim_server/src/agent/lane/model/map/tests.rs
+++ b/swim_server/src/agent/lane/model/map/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/supply/tests.rs b/swim_server/src/agent/lane/model/supply/tests.rs
index 3d619732f..699447714 100644
--- a/swim_server/src/agent/lane/model/supply/tests.rs
+++ b/swim_server/src/agent/lane/model/supply/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/model/value/tests.rs b/swim_server/src/agent/lane/model/value/tests.rs
index f60719cc2..4593da8f9 100644
--- a/swim_server/src/agent/lane/model/value/tests.rs
+++ b/swim_server/src/agent/lane/model/value/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lane/tests.rs b/swim_server/src/agent/lane/tests.rs
index ce90e3729..fa1d169b2 100644
--- a/swim_server/src/agent/lane/tests.rs
+++ b/swim_server/src/agent/lane/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/lifecycle/tests.rs b/swim_server/src/agent/lifecycle/tests.rs
index be78aa08d..8df4d6f44 100644
--- a/swim_server/src/agent/lifecycle/tests.rs
+++ b/swim_server/src/agent/lifecycle/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/data_macro_agent.rs b/swim_server/src/agent/tests/data_macro_agent.rs
index fac9b6430..cf2cb1bcf 100644
--- a/swim_server/src/agent/tests/data_macro_agent.rs
+++ b/swim_server/src/agent/tests/data_macro_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/declarive_macro_agent.rs b/swim_server/src/agent/tests/declarive_macro_agent.rs
index a1a820e1e..2efd9b148 100644
--- a/swim_server/src/agent/tests/declarive_macro_agent.rs
+++ b/swim_server/src/agent/tests/declarive_macro_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/enum_action_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/enum_action_lifecycle.rs
index 4a10dff24..0f0592824 100644
--- a/swim_server/src/agent/tests/derive/fail/enum_action_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/enum_action_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/enum_agent.rs b/swim_server/src/agent/tests/derive/fail/enum_agent.rs
index 2ef71887f..0dd4d71de 100644
--- a/swim_server/src/agent/tests/derive/fail/enum_agent.rs
+++ b/swim_server/src/agent/tests/derive/fail/enum_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/enum_agent_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/enum_agent_lifecycle.rs
index a4fb3abe2..c4595f502 100644
--- a/swim_server/src/agent/tests/derive/fail/enum_agent_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/enum_agent_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/enum_command_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/enum_command_lifecycle.rs
index 68d871bea..f5abd664e 100644
--- a/swim_server/src/agent/tests/derive/fail/enum_command_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/enum_command_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/enum_map_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/enum_map_lifecycle.rs
index 42a0802e3..0bbab78e8 100644
--- a/swim_server/src/agent/tests/derive/fail/enum_map_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/enum_map_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/enum_value_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/enum_value_lifecycle.rs
index 77f164a19..2810a8fab 100644
--- a/swim_server/src/agent/tests/derive/fail/enum_value_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/enum_value_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/generic_action_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/generic_action_lifecycle.rs
index b9a60f9c5..6cdf75050 100644
--- a/swim_server/src/agent/tests/derive/fail/generic_action_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/generic_action_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/generic_agent.rs b/swim_server/src/agent/tests/derive/fail/generic_agent.rs
index 270c239ae..79fc89077 100644
--- a/swim_server/src/agent/tests/derive/fail/generic_agent.rs
+++ b/swim_server/src/agent/tests/derive/fail/generic_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/generic_agent_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/generic_agent_lifecycle.rs
index f081060e7..b87f22e95 100644
--- a/swim_server/src/agent/tests/derive/fail/generic_agent_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/generic_agent_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,6 +22,6 @@ fn main() {
 
     #[agent_lifecycle(agent = "TestAgent")]
     struct TestAgentLifecycle<T> {
-        field: T
+        field: T,
     }
 }
diff --git a/swim_server/src/agent/tests/derive/fail/generic_command_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/generic_command_lifecycle.rs
index f9ca1d137..95d6ed779 100644
--- a/swim_server/src/agent/tests/derive/fail/generic_command_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/generic_command_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,6 +22,6 @@ fn main() {
 
     #[command_lifecycle(agent = "TestAgent", command_type = "i32")]
     struct CommandLifecycle<T> {
-        field: T
+        field: T,
     }
 }
diff --git a/swim_server/src/agent/tests/derive/fail/generic_map_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/generic_map_lifecycle.rs
index 118c2d7c0..19fd8ceff 100644
--- a/swim_server/src/agent/tests/derive/fail/generic_map_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/generic_map_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/generic_value_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/generic_value_lifecycle.rs
index 9fa027c39..898138224 100644
--- a/swim_server/src/agent/tests/derive/fail/generic_value_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/generic_value_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,6 +22,6 @@ fn main() {
 
     #[value_lifecycle(agent = "TestAgent", event_type = "i32")]
     struct ValueLifecycle<T> {
-        field: T
+        field: T,
     }
 }
diff --git a/swim_server/src/agent/tests/derive/fail/union_action_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/union_action_lifecycle.rs
index 849ab04c5..a5a3fcffa 100644
--- a/swim_server/src/agent/tests/derive/fail/union_action_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/union_action_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/union_agent.rs b/swim_server/src/agent/tests/derive/fail/union_agent.rs
index 72c8cae71..7767aec60 100644
--- a/swim_server/src/agent/tests/derive/fail/union_agent.rs
+++ b/swim_server/src/agent/tests/derive/fail/union_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/union_agent_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/union_agent_lifecycle.rs
index a8f9c1474..2ca465222 100644
--- a/swim_server/src/agent/tests/derive/fail/union_agent_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/union_agent_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/union_command_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/union_command_lifecycle.rs
index 9a21a85d6..28c2ffd33 100644
--- a/swim_server/src/agent/tests/derive/fail/union_command_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/union_command_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/union_map_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/union_map_lifecycle.rs
index 433bd9d90..1ca6f2426 100644
--- a/swim_server/src/agent/tests/derive/fail/union_map_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/union_map_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/fail/union_value_lifecycle.rs b/swim_server/src/agent/tests/derive/fail/union_value_lifecycle.rs
index fcb7d200f..94abae0f7 100644
--- a/swim_server/src/agent/tests/derive/fail/union_value_lifecycle.rs
+++ b/swim_server/src/agent/tests/derive/fail/union_value_lifecycle.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/mod.rs b/swim_server/src/agent/tests/derive/mod.rs
index 091db0a07..786244078 100644
--- a/swim_server/src/agent/tests/derive/mod.rs
+++ b/swim_server/src/agent/tests/derive/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/action_lifecycle_custom_callback.rs b/swim_server/src/agent/tests/derive/pass/action_lifecycle_custom_callback.rs
index 418155c90..fd03bdf62 100644
--- a/swim_server/src/agent/tests/derive/pass/action_lifecycle_custom_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/action_lifecycle_custom_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/action_lifecycle_default_callback.rs b/swim_server/src/agent/tests/derive/pass/action_lifecycle_default_callback.rs
index 2f6baf033..e4819d369 100644
--- a/swim_server/src/agent/tests/derive/pass/action_lifecycle_default_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/action_lifecycle_default_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/action_lifecycle_no_callback.rs b/swim_server/src/agent/tests/derive/pass/action_lifecycle_no_callback.rs
index 37cbbd3d4..711e7cffa 100644
--- a/swim_server/src/agent/tests/derive/pass/action_lifecycle_no_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/action_lifecycle_no_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/agent_lifecycle_custom_callback.rs b/swim_server/src/agent/tests/derive/pass/agent_lifecycle_custom_callback.rs
index bab8b6b90..4b4d81ced 100644
--- a/swim_server/src/agent/tests/derive/pass/agent_lifecycle_custom_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/agent_lifecycle_custom_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/agent_lifecycle_default_callback.rs b/swim_server/src/agent/tests/derive/pass/agent_lifecycle_default_callback.rs
index 7abace07f..3cfce2c88 100644
--- a/swim_server/src/agent/tests/derive/pass/agent_lifecycle_default_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/agent_lifecycle_default_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/agent_lifecycle_no_callback.rs b/swim_server/src/agent/tests/derive/pass/agent_lifecycle_no_callback.rs
index 740650bba..bd1e5cfe3 100644
--- a/swim_server/src/agent/tests/derive/pass/agent_lifecycle_no_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/agent_lifecycle_no_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/command_lifecycle_custom_callback.rs b/swim_server/src/agent/tests/derive/pass/command_lifecycle_custom_callback.rs
index 0102d07a7..ddeefde5a 100644
--- a/swim_server/src/agent/tests/derive/pass/command_lifecycle_custom_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/command_lifecycle_custom_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/command_lifecycle_default_callback.rs b/swim_server/src/agent/tests/derive/pass/command_lifecycle_default_callback.rs
index 4933c69db..fe5707f97 100644
--- a/swim_server/src/agent/tests/derive/pass/command_lifecycle_default_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/command_lifecycle_default_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/command_lifecycle_no_callback.rs b/swim_server/src/agent/tests/derive/pass/command_lifecycle_no_callback.rs
index 137f28f31..14a4f9f17 100644
--- a/swim_server/src/agent/tests/derive/pass/command_lifecycle_no_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/command_lifecycle_no_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/map_lifecycle_custom_callback.rs b/swim_server/src/agent/tests/derive/pass/map_lifecycle_custom_callback.rs
index 5ff809979..d994b4e31 100644
--- a/swim_server/src/agent/tests/derive/pass/map_lifecycle_custom_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/map_lifecycle_custom_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/map_lifecycle_default_callback.rs b/swim_server/src/agent/tests/derive/pass/map_lifecycle_default_callback.rs
index f3c51c646..7f004cc03 100644
--- a/swim_server/src/agent/tests/derive/pass/map_lifecycle_default_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/map_lifecycle_default_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/map_lifecycle_no_callback.rs b/swim_server/src/agent/tests/derive/pass/map_lifecycle_no_callback.rs
index d43bf16ae..591f71b01 100644
--- a/swim_server/src/agent/tests/derive/pass/map_lifecycle_no_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/map_lifecycle_no_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/mod.rs b/swim_server/src/agent/tests/derive/pass/mod.rs
index 588da5e1a..7c898355a 100644
--- a/swim_server/src/agent/tests/derive/pass/mod.rs
+++ b/swim_server/src/agent/tests/derive/pass/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/swim_agent_empty.rs b/swim_server/src/agent/tests/derive/pass/swim_agent_empty.rs
index 23afff4d3..03c43eb1b 100644
--- a/swim_server/src/agent/tests/derive/pass/swim_agent_empty.rs
+++ b/swim_server/src/agent/tests/derive/pass/swim_agent_empty.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes.rs b/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes.rs
index 0b67a616a..c26016696 100644
--- a/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes.rs
+++ b/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes_public.rs b/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes_public.rs
index 3134af4e9..8b37a069a 100644
--- a/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes_public.rs
+++ b/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes_public.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes_repeated.rs b/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes_repeated.rs
index cd2119562..fabaa3a42 100644
--- a/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes_repeated.rs
+++ b/swim_server/src/agent/tests/derive/pass/swim_agent_multiple_lanes_repeated.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/swim_agent_no_config.rs b/swim_server/src/agent/tests/derive/pass/swim_agent_no_config.rs
index 043b79ff1..050bd57ad 100644
--- a/swim_server/src/agent/tests/derive/pass/swim_agent_no_config.rs
+++ b/swim_server/src/agent/tests/derive/pass/swim_agent_no_config.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/swim_agent_single_lane.rs b/swim_server/src/agent/tests/derive/pass/swim_agent_single_lane.rs
index faff98876..f7ec3867f 100644
--- a/swim_server/src/agent/tests/derive/pass/swim_agent_single_lane.rs
+++ b/swim_server/src/agent/tests/derive/pass/swim_agent_single_lane.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/value_lifecycle_custom_callback.rs b/swim_server/src/agent/tests/derive/pass/value_lifecycle_custom_callback.rs
index 054c22c47..48f839394 100644
--- a/swim_server/src/agent/tests/derive/pass/value_lifecycle_custom_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/value_lifecycle_custom_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/value_lifecycle_default_callback.rs b/swim_server/src/agent/tests/derive/pass/value_lifecycle_default_callback.rs
index 98474c9f1..27ee9a666 100644
--- a/swim_server/src/agent/tests/derive/pass/value_lifecycle_default_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/value_lifecycle_default_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/derive/pass/value_lifecycle_no_callback.rs b/swim_server/src/agent/tests/derive/pass/value_lifecycle_no_callback.rs
index f4ef7cda3..9bd486995 100644
--- a/swim_server/src/agent/tests/derive/pass/value_lifecycle_no_callback.rs
+++ b/swim_server/src/agent/tests/derive/pass/value_lifecycle_no_callback.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/mod.rs b/swim_server/src/agent/tests/mod.rs
index 441996381..32eb124c4 100644
--- a/swim_server/src/agent/tests/mod.rs
+++ b/swim_server/src/agent/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/reporting_agent.rs b/swim_server/src/agent/tests/reporting_agent.rs
index 5b35c98b8..577968021 100644
--- a/swim_server/src/agent/tests/reporting_agent.rs
+++ b/swim_server/src/agent/tests/reporting_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/reporting_macro_agent.rs b/swim_server/src/agent/tests/reporting_macro_agent.rs
index b2dbd9985..95fcd48d5 100644
--- a/swim_server/src/agent/tests/reporting_macro_agent.rs
+++ b/swim_server/src/agent/tests/reporting_macro_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/store_agent.rs b/swim_server/src/agent/tests/store_agent.rs
index cb28f3c3a..714be065e 100644
--- a/swim_server/src/agent/tests/store_agent.rs
+++ b/swim_server/src/agent/tests/store_agent.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/agent/tests/test_clock.rs b/swim_server/src/agent/tests/test_clock.rs
index 2f61a9cee..e282612be 100644
--- a/swim_server/src/agent/tests/test_clock.rs
+++ b/swim_server/src/agent/tests/test_clock.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/info/tests.rs b/swim_server/src/meta/info/tests.rs
index 262c98d9a..eb923f195 100644
--- a/swim_server/src/meta/info/tests.rs
+++ b/swim_server/src/meta/info/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/log/tests.rs b/swim_server/src/meta/log/tests.rs
index 0d8857aa5..4e058de08 100644
--- a/swim_server/src/meta/log/tests.rs
+++ b/swim_server/src/meta/log/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/meta/tests.rs b/swim_server/src/meta/tests.rs
index aa3c3e2f8..e1f459a1f 100644
--- a/swim_server/src/meta/tests.rs
+++ b/swim_server/src/meta/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/error/tests.rs b/swim_server/src/plane/error/tests.rs
index bc6c06ea9..cd17c27b1 100644
--- a/swim_server/src/plane/error/tests.rs
+++ b/swim_server/src/plane/error/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/router/tests/mod.rs b/swim_server/src/plane/router/tests/mod.rs
index f3d94af87..8795c49f0 100644
--- a/swim_server/src/plane/router/tests/mod.rs
+++ b/swim_server/src/plane/router/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/spec/tests.rs b/swim_server/src/plane/spec/tests.rs
index 63c8e6a07..3910b3436 100644
--- a/swim_server/src/plane/spec/tests.rs
+++ b/swim_server/src/plane/spec/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/tests/fixture.rs b/swim_server/src/plane/tests/fixture.rs
index 927a2ebf3..6d0702cb1 100644
--- a/swim_server/src/plane/tests/fixture.rs
+++ b/swim_server/src/plane/tests/fixture.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/src/plane/tests/mod.rs b/swim_server/src/plane/tests/mod.rs
index c5555bc67..d8bbf27e5 100644
--- a/swim_server/src/plane/tests/mod.rs
+++ b/swim_server/src/plane/tests/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/lane/tests.rs b/swim_server/swim_metrics/src/lane/tests.rs
index ed11042e0..97b2cb03a 100644
--- a/swim_server/swim_metrics/src/lane/tests.rs
+++ b/swim_server/swim_metrics/src/lane/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/tests.rs b/swim_server/swim_metrics/src/tests.rs
index 476f6f0d2..71d2f98bd 100644
--- a/swim_server/swim_metrics/src/tests.rs
+++ b/swim_server/swim_metrics/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_server/swim_metrics/src/uplink/tests.rs b/swim_server/swim_metrics/src/uplink/tests.rs
index b9f40813a..b0e2a5794 100644
--- a/swim_server/swim_metrics/src/uplink/tests.rs
+++ b/swim_server/swim_metrics/src/uplink/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_store/rocks_store/src/tests.rs b/swim_store/rocks_store/src/tests.rs
index c56925502..37cde01ec 100644
--- a/swim_store/rocks_store/src/tests.rs
+++ b/swim_store/rocks_store/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/byte_channel/src/tests.rs b/swim_utilities/byte_channel/src/tests.rs
index 6d271807e..3cd8087e9 100644
--- a/swim_utilities/byte_channel/src/tests.rs
+++ b/swim_utilities/byte_channel/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_format/src/print/tests.rs b/swim_utilities/swim_format/src/print/tests.rs
index a47fa4b36..eef120bfe 100644
--- a/swim_utilities/swim_format/src/print/tests.rs
+++ b/swim_utilities/swim_format/src/print/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/combinators/tests.rs b/swim_utilities/swim_future/src/combinators/tests.rs
index 87fa3a36e..6baf0ad37 100644
--- a/swim_utilities/swim_future/src/combinators/tests.rs
+++ b/swim_utilities/swim_future/src/combinators/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/item_sink/either/tests.rs b/swim_utilities/swim_future/src/item_sink/either/tests.rs
index 1d7a09742..ebdd40746 100644
--- a/swim_utilities/swim_future/src/item_sink/either/tests.rs
+++ b/swim_utilities/swim_future/src/item_sink/either/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/open_ended/tests.rs b/swim_utilities/swim_future/src/open_ended/tests.rs
index 68f89c7bc..37bd00018 100644
--- a/swim_utilities/swim_future/src/open_ended/tests.rs
+++ b/swim_utilities/swim_future/src/open_ended/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/retryable/tests.rs b/swim_utilities/swim_future/src/retryable/tests.rs
index 6f7b6499e..b12052a13 100644
--- a/swim_utilities/swim_future/src/retryable/tests.rs
+++ b/swim_utilities/swim_future/src/retryable/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_future/src/task/tests.rs b/swim_utilities/swim_future/src/task/tests.rs
index 2fae18693..e60b990cb 100644
--- a/swim_utilities/swim_future/src/task/tests.rs
+++ b/swim_utilities/swim_future/src/task/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_iteratee/src/tests.rs b/swim_utilities/swim_iteratee/src/tests.rs
index a4f3d3c65..9955e04e4 100644
--- a/swim_utilities/swim_iteratee/src/tests.rs
+++ b/swim_utilities/swim_iteratee/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_lrucache/src/lru_cache/tests.rs b/swim_utilities/swim_lrucache/src/lru_cache/tests.rs
index 9228d33b7..52b93f6fe 100644
--- a/swim_utilities/swim_lrucache/src/lru_cache/tests.rs
+++ b/swim_utilities/swim_lrucache/src/lru_cache/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_route/src/route_pattern/tests.rs b/swim_utilities/swim_route/src/route_pattern/tests.rs
index fda598d44..ee156cc0d 100644
--- a/swim_utilities/swim_route/src/route_pattern/tests.rs
+++ b/swim_utilities/swim_route/src/route_pattern/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_route/src/uri/tests.rs b/swim_utilities/swim_route/src/uri/tests.rs
index 0a5823f2f..3757f16fc 100644
--- a/swim_utilities/swim_route/src/uri/tests.rs
+++ b/swim_utilities/swim_route/src/uri/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_rtree/src/tests.rs b/swim_utilities/swim_rtree/src/tests.rs
index e7a2b55f8..9da87ed97 100644
--- a/swim_utilities/swim_rtree/src/tests.rs
+++ b/swim_utilities/swim_rtree/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_sync/src/circular_buffer/tests.rs b/swim_utilities/swim_sync/src/circular_buffer/tests.rs
index af220847d..12c46543f 100644
--- a/swim_utilities/swim_sync/src/circular_buffer/tests.rs
+++ b/swim_utilities/swim_sync/src/circular_buffer/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_sync/src/rwlock/tests.rs b/swim_utilities/swim_sync/src/rwlock/tests.rs
index 4dfc62bf8..065cc78bf 100644
--- a/swim_utilities/swim_sync/src/rwlock/tests.rs
+++ b/swim_utilities/swim_sync/src/rwlock/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_sync/src/topic/tests.rs b/swim_utilities/swim_sync/src/topic/tests.rs
index d2117438d..be521cf0e 100644
--- a/swim_utilities/swim_sync/src/topic/tests.rs
+++ b/swim_utilities/swim_sync/src/topic/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_test_util/Cargo.toml b/swim_utilities/swim_test_util/Cargo.toml
index 8876d9fe1..645e55588 100644
--- a/swim_utilities/swim_test_util/Cargo.toml
+++ b/swim_utilities/swim_test_util/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "swim_test_util"
 version = "0.1.0"
-authors = ["Swim.AI developers info@swim.ai"]
+authors = ["Swim Inc. developers info@swim.ai"]
 edition = "2018"
 
 [dependencies]
diff --git a/swim_utilities/swim_test_util/src/lib.rs b/swim_utilities/swim_test_util/src/lib.rs
index 36ff01361..b883f74ee 100644
--- a/swim_utilities/swim_test_util/src/lib.rs
+++ b/swim_utilities/swim_test_util/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_time/src/instant/tests.rs b/swim_utilities/swim_time/src/instant/tests.rs
index c507cb765..a7a26f1ac 100644
--- a/swim_utilities/swim_time/src/instant/tests.rs
+++ b/swim_utilities/swim_time/src/instant/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_trigger/src/promise/tests.rs b/swim_utilities/swim_trigger/src/promise/tests.rs
index f32529cd2..2ad0728b9 100644
--- a/swim_utilities/swim_trigger/src/promise/tests.rs
+++ b/swim_utilities/swim_trigger/src/promise/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // 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/swim_utilities/swim_trigger/src/tests.rs b/swim_utilities/swim_trigger/src/tests.rs
index 9f070d3a1..f4ece613d 100644
--- a/swim_utilities/swim_trigger/src/tests.rs
+++ b/swim_utilities/swim_trigger/src/tests.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2021 SWIM.AI inc.
+// Copyright 2015-2021 Swim Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.