diff --git a/README.md b/README.md
index 63aa803c6d6c38a3f4da67bdf94ae36632ab4122..9884c0efe6303b43528046bd5695c31409c1d492 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-privategrity/crypto
+elixxir/crypto
-------------------
[](https://gitlab.com/elixxir/crypto/commits/master)
diff --git a/blockchain/block.go b/blockchain/block.go
index b7a2aee262a3a905881acda701dc3609ae4abef4..2ecdc9842fb416b9341eaca0610c4ea062d51c84 100644
--- a/blockchain/block.go
+++ b/blockchain/block.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package blockchain
import (
diff --git a/blockchain/block_test.go b/blockchain/block_test.go
index 63dd6ea4450cdf6610406800b6ecf956b0b781f3..0e3b82cc5993c6678de2f370c0c0f2ec674ab5c9 100644
--- a/blockchain/block_test.go
+++ b/blockchain/block_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package blockchain
import (
diff --git a/blockchain/lifecycle.go b/blockchain/lifecycle.go
index 5aebcb3bff4b19bb360d3b081ea4738a3edf5e04..66bd77a40895e7f628018b125f6904cc09b8642f 100644
--- a/blockchain/lifecycle.go
+++ b/blockchain/lifecycle.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package blockchain
import "errors"
diff --git a/coin/base.go b/coin/base.go
index 4d443a21c27e4f5899d193487f43718860825725..d6ae5666e6c34a1046e0a2150eb8ca385eca1337 100644
--- a/coin/base.go
+++ b/coin/base.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/base_test.go b/coin/base_test.go
index e79499538b735d37e24f9b212d0f767af1ca6f5f..f3db9d2b2384f1f4417044bce0c15632a35b2c88 100644
--- a/coin/base_test.go
+++ b/coin/base_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/coin.go b/coin/coin.go
index 18243dcbe76565c989d03fc2a6e8a1ae4ca3e311..e69ce3375f005a2535441dd74fc9d8fce1dd1a38 100644
--- a/coin/coin.go
+++ b/coin/coin.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
// An individual coin in the system
diff --git a/coin/coin_test.go b/coin/coin_test.go
index e91a101ad05f3f4234ffd86ed2601d307bf92492..1c72c039fcdac70c5fe3f61e70f309d1bab3719b 100644
--- a/coin/coin_test.go
+++ b/coin/coin_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/compound.go b/coin/compound.go
index 00a1359d25afac56e5b16e499f2889d64b35e268..f9d0db73f86e6a70f5d641f84fd007c1ab8ae107 100644
--- a/coin/compound.go
+++ b/coin/compound.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/compound_test.go b/coin/compound_test.go
index f35d35db00532f1598d2d093579188a8c43c2ad4..2177fffc5d933f5feb7c5cf4f4d66c354807b3dd 100644
--- a/coin/compound_test.go
+++ b/coin/compound_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/denomination.go b/coin/denomination.go
index ec16a8fb84537d9898245a0dff95a34ccf330464..eaeea3a1be089e65785047aad08ea06b76486c0c 100644
--- a/coin/denomination.go
+++ b/coin/denomination.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/denomination_test.go b/coin/denomination_test.go
index 6bcaca200496c7f70f63f3470f316bb9cd7daaf6..8536a91474666df54a3aa28160b6b0acd364485b 100644
--- a/coin/denomination_test.go
+++ b/coin/denomination_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/mint.go b/coin/mint.go
index 2ddfb841b1755f934d13c405485be22a5000a7f8..459eca1f193d11ae1d2e46a5ec123f25f5c2ee9c 100644
--- a/coin/mint.go
+++ b/coin/mint.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/mint_test.go b/coin/mint_test.go
index 3b1942ce6b8244d73102d3dfc85b49bf21ad5506..f6b46d44ec3b57f0b4ab05002484bd9a9023dc14 100644
--- a/coin/mint_test.go
+++ b/coin/mint_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/seed.go b/coin/seed.go
index aebd831569738792c528610a8d7f3fdbeacff956..85ff37b0bf2a1a36b625a03c3f181cf0181fbd0a 100644
--- a/coin/seed.go
+++ b/coin/seed.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/seed_test.go b/coin/seed_test.go
index 0f8d4405d76e96c1f583446baf75d2e8a354b985..f5f2e6155dd3b85c4023a936578b6e85adf52258 100644
--- a/coin/seed_test.go
+++ b/coin/seed_test.go
@@ -1,7 +1,12 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
- //"math"
"math"
"math/rand"
"reflect"
diff --git a/coin/sleeve.go b/coin/sleeve.go
index 5b457d2ef471f6c51573799bce3a433fd280dba6..55f223298ccdc849fb62a321bd0159923e42544b 100644
--- a/coin/sleeve.go
+++ b/coin/sleeve.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/coin/sleeve_test.go b/coin/sleeve_test.go
index 99e00506c1f68f73c562de97036dafef6ce8d6f8..9c068c8e17a63cc64096766db397336a56a89785 100644
--- a/coin/sleeve_test.go
+++ b/coin/sleeve_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package coin
import (
diff --git a/cyclic/group.go b/cyclic/group.go
index 1d698422a1f3c8a1993e64fe1dd88b7b57803c7b..988754ab5831769e69296d2941a7dfec4106812c 100644
--- a/cyclic/group.go
+++ b/cyclic/group.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package cyclic
import (
diff --git a/cyclic/group_test.go b/cyclic/group_test.go
index f789483cc789f4d2750407a1abac2d5f82a1bdcd..4d389324a8fbadeb4bfe07f7de260a11337537f8 100644
--- a/cyclic/group_test.go
+++ b/cyclic/group_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package cyclic
import (
diff --git a/cyclic/int.go b/cyclic/int.go
index 6da2a283deba0dfff1b7b6892749e52271d008d5..bfcebb217687bcfd23a61d2e3d52aa200fa4a60a 100644
--- a/cyclic/int.go
+++ b/cyclic/int.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package cyclic
import (
diff --git a/cyclic/int_test.go b/cyclic/int_test.go
index 98c4d728901c26e7bd8c23de6c129765c1a90c89..7d9c76c20c71925cd7a1b51be85d40f10b538791 100644
--- a/cyclic/int_test.go
+++ b/cyclic/int_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package cyclic
import (
diff --git a/cyclic/random.go b/cyclic/random.go
index 594da01eec1abaad2299e62cdf873e1e29cacb02..4343d90827d7d7cf4d398b8a2c19bac08d335af6 100644
--- a/cyclic/random.go
+++ b/cyclic/random.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package cyclic
import (
diff --git a/cyclic/random_test.go b/cyclic/random_test.go
index 461dbaae089be07f558d75185c04609fc48bb850..2c47bcc8267188d58d868c5253d4f4a0bc85bb79 100644
--- a/cyclic/random_test.go
+++ b/cyclic/random_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package cyclic
import (
diff --git a/cyclic/shuffle.go b/cyclic/shuffle.go
index 9dbe2a8300490d5566d4227e75e865c772d2d99d..dff6d1db63618b5225ca607f3a28568f4b88dda4 100644
--- a/cyclic/shuffle.go
+++ b/cyclic/shuffle.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package cyclic
import "math"
diff --git a/cyclic/shuffle_test.go b/cyclic/shuffle_test.go
index 1de465d7fdaa76c6a705c87f41b0f2f20bea2655..b0a0a4d9ee9345632d5afc8c7f1ecd16a48818dc 100644
--- a/cyclic/shuffle_test.go
+++ b/cyclic/shuffle_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package cyclic
import (
diff --git a/diffieHellman/dhkx.go b/diffieHellman/dhkx.go
index 6c2612080d3dd09a7a9c4165516d8b410d7a9034..0f404df2d35253cb02b6780dc2ddbddc0d5c9d7d 100644
--- a/diffieHellman/dhkx.go
+++ b/diffieHellman/dhkx.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package diffieHellman
import (
diff --git a/diffieHellman/dhkx_test.go b/diffieHellman/dhkx_test.go
index ef6101365f702aaa16fa5b8a1c08e66efa2ab3b4..e6a5312a2267628ca3dab7c50e89c7ff0a8ea86f 100644
--- a/diffieHellman/dhkx_test.go
+++ b/diffieHellman/dhkx_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package diffieHellman
import (
diff --git a/format/messagePayload.go b/format/messagePayload.go
index 93e287b3501082be15aa8e864d99552e3c8c3931..3bc39d9a8f3d79963344331997a9e2d68de00ff6 100644
--- a/format/messagePayload.go
+++ b/format/messagePayload.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package format
import (
diff --git a/format/messagePayload_test.go b/format/messagePayload_test.go
index 2dfef8a4977f52da8fc8836fc824be4531ea57ed..742fc2108ead2995bb7f703e2fa5949cc2bf8854 100644
--- a/format/messagePayload_test.go
+++ b/format/messagePayload_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package format
import (
diff --git a/format/onboarding.go b/format/onboarding.go
index b8ef12c2ce26ebc486992315a6400bb01fe3affd..0852c9b9a01396297de0aec01895348f23ec8ec8 100644
--- a/format/onboarding.go
+++ b/format/onboarding.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package format
type OnboardPackage struct {
diff --git a/format/recipientPayload.go b/format/recipientPayload.go
index 8a8e69d775364c09095170bcfddccfec95c4fb60..b669feaff2a0576225e4b5e77b157e2f1e58e079 100644
--- a/format/recipientPayload.go
+++ b/format/recipientPayload.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package format
import (
diff --git a/format/recipientPayload_test.go b/format/recipientPayload_test.go
index 8f2b8ef53b2e8ee9610916f12c52b5eb532df58d..97ce885fdea9e7f7dae83e9de87ab75447a56663 100644
--- a/format/recipientPayload_test.go
+++ b/format/recipientPayload_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package format
import (
diff --git a/format/registrationCode.go b/format/registrationCode.go
index f229956d17c9ab2c460c73f28e4c1f7b06f17c4e..0e1b23ebbc882994958cfc0ada19d5a294d35f86 100644
--- a/format/registrationCode.go
+++ b/format/registrationCode.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package format
import (
diff --git a/format/registrationCode_test.go b/format/registrationCode_test.go
index 404de93a02f7163c1c1a280deb9840b7ca937165..cd84a38625243727be6e67318d939956c550ffaa 100644
--- a/format/registrationCode_test.go
+++ b/format/registrationCode_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package format
import (
diff --git a/forward/keys.go b/forward/keys.go
index 35e38a512f798989c67912c3567f93b9b2ec44ac..cde9334b70e80d9284f6bdcee2c8ed8ea06873dc 100644
--- a/forward/keys.go
+++ b/forward/keys.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package forward
import (
diff --git a/forward/keys_test.go b/forward/keys_test.go
index f015487213b9f6c5cad32098a50d076b91e1d82f..59494556966c105d12b574765c84e9774aec1b4e 100644
--- a/forward/keys_test.go
+++ b/forward/keys_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package forward
import (
diff --git a/hash/hash.go b/hash/hash.go
index 42f486eb968b357997dbf887a6548f583caa91f1..dd6b498f7cd2911e4041ac2c0619c44d8e8b2cbe 100644
--- a/hash/hash.go
+++ b/hash/hash.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package hash
import (
diff --git a/hash/hash_test.go b/hash/hash_test.go
index 6dbb5122c824d9ac686233c8f57b8d28f50d5df2..20698c385c763720dc8c74b45e46ad77aa1fe458 100644
--- a/hash/hash_test.go
+++ b/hash/hash_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package hash
import (
diff --git a/id/id_test.go b/id/id_test.go
index ff94843145a8e1031eb6190ef7d78d3cd8d446c8..4536d7a1aef1da39435e033c4b7caae386291c05 100644
--- a/id/id_test.go
+++ b/id/id_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package id
import (
diff --git a/messaging/README.md b/messaging/README.md
index e6ac78dc3796322d7a176cc01feb59da9b97f99d..0d4a52780ae84bd1b30b0efef7c0c9b45d710ed8 100644
--- a/messaging/README.md
+++ b/messaging/README.md
@@ -1,4 +1,4 @@
-# privategrity/crypto/messaging
+# elixxir/crypto/messaging
TBD: This is a proposed redesign and is aspirational at the moment.
diff --git a/shuffle/shuffle.go b/shuffle/shuffle.go
index fefa2bb280e9d8da03896bb080a97f381c1d0557..c5288c9cfe48f36bc94af7c7c834273ce81d646e 100644
--- a/shuffle/shuffle.go
+++ b/shuffle/shuffle.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package shuffle
import (
diff --git a/shuffle/shuffle_test.go b/shuffle/shuffle_test.go
index 495fdca909e6d8468012b3ad3f7c87a1647f8a03..9a6d5bf3fe196dee72959d76511e2fc8291f3780 100644
--- a/shuffle/shuffle_test.go
+++ b/shuffle/shuffle_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package shuffle
import (
diff --git a/verification/mic.go b/verification/mic.go
index 3d2607ae8f1838635d3fbf30627f2efd999f685e..b9227b9f8f6c38ad0bbe60f7ad594935d42b8f0a 100644
--- a/verification/mic.go
+++ b/verification/mic.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package verification
import (
diff --git a/verification/mic_test.go b/verification/mic_test.go
index eafbbfb12ba9667a0844fdd17a8b5c8ca9bb61f1..f84205ba84491f0b2820575cca32e7ec47f9ad58 100644
--- a/verification/mic_test.go
+++ b/verification/mic_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation /
+// /
+// All rights reserved. /
+////////////////////////////////////////////////////////////////////////////////
+
package verification
import "testing"