From d58bdd6889e58f9e8bdec15e10ce0bf5b1c47af6 Mon Sep 17 00:00:00 2001
From: Rex Hoffman <rexhoffman@fb.com>
Date: Wed, 9 Dec 2020 11:20:15 -0800
Subject: [PATCH] github url update, ignoring developers.libra.org

Closes: #6874
---
 .../documentation_bug_report.md               |  2 +-
 .github/PULL_REQUEST_TEMPLATE.md              |  4 +--
 .github/workflows/land-blocking.yml           |  2 +-
 CONTRIBUTING.md                               | 10 +++----
 client/diem-dev/Cargo.toml                    |  2 +-
 client/diem-dev/README.md                     | 26 +++++++++----------
 client/faucet/Cargo.toml                      |  2 +-
 client/json-rpc/Cargo.toml                    |  2 +-
 client/swiss-knife/Cargo.toml                 |  2 +-
 client/swiss-knife/README.md                  |  4 +--
 client/transaction-builder/Cargo.toml         |  2 +-
 common/bitvec/Cargo.toml                      |  2 +-
 common/bounded-executor/Cargo.toml            |  2 +-
 common/channel/Cargo.toml                     |  2 +-
 .../channel/many-keys-stress-test/Cargo.toml  |  2 +-
 common/channel/src/message_queues.rs          |  2 +-
 common/crash-handler/Cargo.toml               |  2 +-
 common/datatest-stable/Cargo.toml             |  2 +-
 common/debug-interface/Cargo.toml             |  2 +-
 common/diemdoc/Cargo.toml                     |  2 +-
 common/infallible/Cargo.toml                  |  2 +-
 common/logger/Cargo.toml                      |  2 +-
 common/logger/derive/Cargo.toml               |  2 +-
 common/metrics-core/Cargo.toml                |  2 +-
 common/metrics/Cargo.toml                     |  2 +-
 common/nibble/Cargo.toml                      |  2 +-
 common/proptest-helpers/Cargo.toml            |  2 +-
 common/retrier/Cargo.toml                     |  2 +-
 common/short-hex-str/Cargo.toml               |  2 +-
 common/subscription-service/Cargo.toml        |  2 +-
 common/temppath/Cargo.toml                    |  2 +-
 common/trace/Cargo.toml                       |  2 +-
 common/workspace-hack/Cargo.toml              |  2 +-
 config/Cargo.toml                             |  2 +-
 config/generate-key/Cargo.toml                |  2 +-
 config/global-constants/Cargo.toml            |  2 +-
 config/management/Cargo.toml                  |  2 +-
 config/management/genesis/Cargo.toml          |  2 +-
 .../network-address-encryption/Cargo.toml     |  2 +-
 config/management/operational/Cargo.toml      |  2 +-
 config/seed-peer-generator/Cargo.toml         |  2 +-
 consensus/Cargo.toml                          |  2 +-
 consensus/README.md                           |  2 +-
 consensus/src/twins/basic_twins_test.rs       |  2 +-
 crypto/crypto-derive/Cargo.toml               |  2 +-
 crypto/crypto/Cargo.toml                      |  2 +-
 crypto/crypto/README.md                       |  2 +-
 diem-node/Cargo.toml                          |  2 +-
 docker/compose/README.md                      |  2 +-
 execution/README.md                           |  2 +-
 execution/db-bootstrapper/Cargo.toml          |  2 +-
 execution/executor-benchmark/Cargo.toml       |  2 +-
 execution/executor-test-helpers/Cargo.toml    |  2 +-
 execution/executor-types/Cargo.toml           |  2 +-
 execution/executor/Cargo.toml                 |  2 +-
 json-rpc/Cargo.toml                           |  2 +-
 json-rpc/types/Cargo.toml                     |  2 +-
 language/README.md                            |  2 +-
 language/benchmarks/Cargo.toml                |  2 +-
 language/bytecode-verifier/Cargo.toml         |  2 +-
 language/bytecode-verifier/README.md          |  2 +-
 .../bytecode-verifier-tests/Cargo.toml        |  2 +-
 .../invalid-mutations/Cargo.toml              |  2 +-
 language/compiler/Cargo.toml                  |  2 +-
 language/compiler/README.md                   |  6 ++---
 language/compiler/ir-to-bytecode/Cargo.toml   |  2 +-
 .../compiler/ir-to-bytecode/syntax/Cargo.toml |  2 +-
 .../diem-tools/diem-events-fetcher/Cargo.toml |  2 +-
 .../diem-validator-interface/Cargo.toml       |  2 +-
 .../diem-tools/transaction-replay/Cargo.toml  |  2 +-
 .../writeset-transaction-generator/Cargo.toml |  2 +-
 language/diem-vm/Cargo.toml                   |  2 +-
 language/diem-vm/README.md                    |  2 +-
 language/e2e-testsuite/Cargo.toml             |  2 +-
 language/ir-testsuite/Cargo.toml              |  2 +-
 language/move-core/types/Cargo.toml           |  2 +-
 .../move-core/types/src/account_address.rs    |  2 +-
 language/move-ir/types/Cargo.toml             |  2 +-
 language/move-lang/README.md                  |  2 +-
 language/move-prover/README.md                |  2 +-
 language/move-prover/bytecode/Cargo.toml      |  2 +-
 language/move-prover/tests/testsuite.rs       |  2 +-
 language/move-vm/integration-tests/Cargo.toml |  2 +-
 language/move-vm/natives/Cargo.toml           |  2 +-
 language/move-vm/runtime/Cargo.toml           |  2 +-
 language/move-vm/test-utils/Cargo.toml        |  2 +-
 language/move-vm/types/Cargo.toml             |  2 +-
 language/stdlib/Cargo.toml                    |  2 +-
 language/stdlib/README.md                     |  2 +-
 language/stdlib/compiled/Cargo.toml           |  2 +-
 language/stdlib/modules/LCS.move              |  2 +-
 language/stdlib/modules/doc/LCS.md            |  2 +-
 .../doc/spec_documentation.md                 |  4 +--
 .../doc/transaction_script_documentation.md   |  8 +++---
 .../spec_documentation_template.md            |  4 +--
 ...ansaction_script_documentation_template.md |  8 +++---
 language/testing-infra/e2e-tests/Cargo.toml   |  2 +-
 .../testing-infra/functional-tests/Cargo.toml |  2 +-
 .../module-generation/Cargo.toml              |  2 +-
 .../testing-infra/test-generation/Cargo.toml  |  2 +-
 .../testing-infra/test-generation/README.md   |  2 +-
 language/tools/genesis-viewer/Cargo.toml      |  2 +-
 language/tools/move-cli/Cargo.toml            |  2 +-
 language/tools/move-cli/README.md             | 22 ++++++++--------
 language/tools/move-coverage/Cargo.toml       |  2 +-
 language/tools/move-explain/Cargo.toml        |  2 +-
 language/tools/resource-viewer/Cargo.toml     |  2 +-
 language/tools/vm-genesis/Cargo.toml          |  2 +-
 language/transaction-builder/Cargo.toml       |  2 +-
 .../transaction-builder/generator/Cargo.toml  |  2 +-
 .../transaction-builder/generator/README.md   |  2 +-
 language/vm/Cargo.toml                        |  2 +-
 language/vm/README.md                         |  6 ++---
 language/vm/serializer-tests/Cargo.toml       |  2 +-
 mempool/Cargo.toml                            |  2 +-
 mempool/README.md                             |  2 +-
 network/Cargo.toml                            |  2 +-
 network/README.md                             |  2 +-
 network/builder/Cargo.toml                    |  2 +-
 network/memsocket/Cargo.toml                  |  2 +-
 network/netcore/Cargo.toml                    |  2 +-
 network/network-address/Cargo.toml            |  2 +-
 network/simple-onchain-discovery/Cargo.toml   |  2 +-
 network/socket-bench-server/Cargo.toml        |  2 +-
 network/src/peer_manager/mod.rs               |  2 +-
 .../src/protocols/wire/messaging/v1/mod.rs    |  2 +-
 network/src/transport/mod.rs                  |  2 +-
 secure/json-rpc/Cargo.toml                    |  2 +-
 secure/json-rpc/README.md                     |  2 +-
 secure/key-manager/Cargo.toml                 |  2 +-
 secure/key-manager/README.md                  |  2 +-
 secure/net/Cargo.toml                         |  2 +-
 secure/push-metrics/Cargo.toml                |  2 +-
 secure/storage/Cargo.toml                     |  2 +-
 secure/storage/README.md                      |  2 +-
 secure/storage/github/Cargo.toml              |  2 +-
 secure/storage/vault/Cargo.toml               |  2 +-
 secure/time/Cargo.toml                        |  2 +-
 specifications/README.md                      |  4 +--
 specifications/crypto/README.md               |  6 ++---
 specifications/state_sync/README.md           |  6 ++---
 .../key_manager/README.md                     | 14 +++++-----
 state-synchronizer/Cargo.toml                 |  2 +-
 state-synchronizer/README.md                  |  2 +-
 .../src/tests/integration_tests.rs            |  2 +-
 storage/README.md                             |  2 +-
 storage/accumulator/Cargo.toml                |  2 +-
 storage/backup/backup-cli/Cargo.toml          |  2 +-
 storage/backup/backup-service/Cargo.toml      |  2 +-
 storage/diemdb/Cargo.toml                     |  2 +-
 storage/diemsum/Cargo.toml                    |  2 +-
 storage/inspector/Cargo.toml                  |  2 +-
 storage/jellyfish-merkle/Cargo.toml           |  2 +-
 storage/schemadb/Cargo.toml                   |  2 +-
 storage/scratchpad/Cargo.toml                 |  2 +-
 storage/state-view/Cargo.toml                 |  2 +-
 storage/storage-client/Cargo.toml             |  2 +-
 storage/storage-interface/Cargo.toml          |  2 +-
 storage/storage-service/Cargo.toml            |  2 +-
 testsuite/cli/Cargo.toml                      |  2 +-
 testsuite/cli/diem-wallet/Cargo.toml          |  2 +-
 testsuite/cluster-test/Cargo.toml             |  2 +-
 testsuite/diem-fuzzer/Cargo.toml              |  2 +-
 testsuite/diem-fuzzer/fuzz/Cargo.toml         |  2 +-
 testsuite/diem-swarm/Cargo.toml               |  2 +-
 testsuite/generate-format/Cargo.toml          |  2 +-
 testsuite/smoke-test/Cargo.toml               |  2 +-
 testsuite/smoke-test/attribute/Cargo.toml     |  2 +-
 types/Cargo.toml                              |  2 +-
 vm-validator/Cargo.toml                       |  2 +-
 170 files changed, 221 insertions(+), 221 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/documentation_bug_report.md b/.github/ISSUE_TEMPLATE/documentation_bug_report.md
index 0505ec87bc24f..f89c3c59df3e4 100644
--- a/.github/ISSUE_TEMPLATE/documentation_bug_report.md
+++ b/.github/ISSUE_TEMPLATE/documentation_bug_report.md
@@ -9,7 +9,7 @@ assignees: ''
 
 # 🐛 Bug
 
-If you're looking to report an issue with the Diem Core project go to https://github.com/libra/libra
+If you're looking to report an issue with the Diem Core project go to https://github.com/diem/diem
 
 <!-- A clear and concise description of what the bug is.
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 99a4d3ad5d2d2..13b56302301ed 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,7 +8,7 @@ The project is undergoing daily changes. Pull Requests will be reviewed and resp
 
 (Write your motivation for proposed changes here.)
 
-### Have you read the [Contributing Guidelines on pull requests](https://github.com/libra/libra/blob/master/CONTRIBUTING.md#pull-requests)?
+### Have you read the [Contributing Guidelines on pull requests](https://github.com/diem/diem/blob/master/CONTRIBUTING.md#pull-requests)?
 
 (Write your answer here.)
 
@@ -18,4 +18,4 @@ The project is undergoing daily changes. Pull Requests will be reviewed and resp
 
 ## Related PRs
 
-(If this PR adds or changes functionality, please take some time to update the docs at https://github.com/libra/libra/developers.libra.org, and link to your PR here.)
+(If this PR adds or changes functionality, please take some time to update the docs at https://github.com/diem/diem/developers.libra.org, and link to your PR here.)
diff --git a/.github/workflows/land-blocking.yml b/.github/workflows/land-blocking.yml
index 9cc4990b31e28..19715a7bfdb1e 100644
--- a/.github/workflows/land-blocking.yml
+++ b/.github/workflows/land-blocking.yml
@@ -268,7 +268,7 @@ jobs:
                 body = "Cluster Test runner failed.";
                 console.error(err);
               }
-              body += " See https://github.com/libra/libra/actions/runs/${{github.run_id}}";
+              body += " See https://github.com/diem/diem/actions/runs/${{github.run_id}}";
               // Post comment on PR then fail this workflow
               should_fail = true;
             }
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4363b976c82c8..ec093caf41a3f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ development copy.
 To get the development installation with all the necessary dependencies for
 linting, testing, and building the documentation, run the following:
 ```bash
-git clone https://github.com/libra/libra.git
+git clone https://github.com/diem/diem.git
 cd libra
 ./scripts/dev_setup.sh
 cargo build
@@ -38,7 +38,7 @@ detailed guidance about how to contribute to the project.
 #### Documentation
 
 Diem's developer website is also open source (the code can be found in this
-[repository](https://github.com/libra/libra/developers.diem.com/website/)).  It is built using
+[repository](https://github.com/diem/diem/developers.diem.com/website/)).  It is built using
 [Docusaurus](https://docusaurus.io/):
 
 If you know Markdown, you can already contribute! How to contribute can be found in the [website
@@ -170,13 +170,13 @@ able to be built and passes all checks performed by CI.
 For pull request to be accepted by any Diem projects, a CLA must be signed.
 You will only need to do this once to work on any of Diem's open source
 projects. Individuals contributing on their own behalf can sign the [Individual
-CLA](https://github.com/libra/libra/blob/master/documentation/contributing/individual-cla.pdf).
+CLA](https://github.com/diem/diem/blob/master/documentation/contributing/individual-cla.pdf).
 If you are contributing on behalf of your employer, please ask them to sign the
 [Corporate
-CLA](https://github.com/libra/libra/blob/master/documentation/contributing/corporate-cla.pdf).
+CLA](https://github.com/diem/diem/blob/master/documentation/contributing/corporate-cla.pdf).
 
 ## Issues
 
-Diem uses [GitHub issues](https://github.com/libra/libra/issues) to track
+Diem uses [GitHub issues](https://github.com/diem/diem/issues) to track
 bugs. Please include necessary information and instructions to reproduce your
 issue.
diff --git a/client/diem-dev/Cargo.toml b/client/diem-dev/Cargo.toml
index 46adaa36255eb..95021010020fc 100644
--- a/client/diem-dev/Cargo.toml
+++ b/client/diem-dev/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-dev"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem client"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/client/diem-dev/README.md b/client/diem-dev/README.md
index 3440eade39bb8..b53a3e8fc334c 100644
--- a/client/diem-dev/README.md
+++ b/client/diem-dev/README.md
@@ -8,8 +8,8 @@ Diem has changed a lot since 6/18 and the new whitepaper, but I don't think we'v
 
 In the original Diem design, all accounts were the same. Now, every account has exactly one *role*. There are seven roles in all (`ParentVASP`, `ChildVASP`, `DesignatedDealer`, `Validator`, `ValidatorOperator`, `TreasuryCompliance`, and `AssocRoot`), but we will focus on the client-relevant `ParentVASP` and `ChildVASP` roles here. A VASP (virtual asset service provider) is a regulated wallet.
 
-* A [ParentVASP](https://github.com/libra/libra/blob/master/language/stdlib/modules/vasp.move#L20;L34) is the unique root account for a particular VASP (i.e., there will be one account of this type per company). A `ParentVASP` carries three key pieces of data: its `human_name`, `base_url` (a URL containing an endpoint to hit for off-chain APIs like exchanging KYC information and the travel rule protocol), and a `compliance_public_key` (ed5519 public key for authenticating signatures on KYC and travel rule payloads).
-* A [ChildVASP](https://github.com/libra/libra/blob/master/language/stdlib/modules/vasp.move#L40) is a child account of a particular parent VASP. A VASP need not have any child accounts, but child accounts allow more sophisticated a VASP to maintain a structured on-chain presence (e.g., separate cold/warm/hot accounts). A parent VASP can currently have an unbounded number of children (though we'll need to pick a reasonable [limit](https://github.com/libra/libra/issues/3949)). A child knows the account address of its parent VASP. When transacting with a child account, clients should use this to look up its parent, then use the `base_url` and `compliance_public_key` of the parent for off-chain communication.
+* A [ParentVASP](https://github.com/diem/diem/blob/master/language/stdlib/modules/vasp.move#L20;L34) is the unique root account for a particular VASP (i.e., there will be one account of this type per company). A `ParentVASP` carries three key pieces of data: its `human_name`, `base_url` (a URL containing an endpoint to hit for off-chain APIs like exchanging KYC information and the travel rule protocol), and a `compliance_public_key` (ed5519 public key for authenticating signatures on KYC and travel rule payloads).
+* A [ChildVASP](https://github.com/diem/diem/blob/master/language/stdlib/modules/vasp.move#L40) is a child account of a particular parent VASP. A VASP need not have any child accounts, but child accounts allow more sophisticated a VASP to maintain a structured on-chain presence (e.g., separate cold/warm/hot accounts). A parent VASP can currently have an unbounded number of children (though we'll need to pick a reasonable [limit](https://github.com/diem/diem/issues/3949)). A child knows the account address of its parent VASP. When transacting with a child account, clients should use this to look up its parent, then use the `base_url` and `compliance_public_key` of the parent for off-chain communication.
 
 ### Off-Chain Protocols
 
@@ -21,14 +21,14 @@ There are two currencies in testnet: `XUS` (stablecoin), and `XDX` (synthetic cu
 
 ### Addresses, Authentication Keys, and Cryptographic Keys
 
-Two major changes in new Diem design are the [shrinking](https://github.com/libra/libra/issues/2764) of account addresses from 32 bytes to 16 bytes and the addition of multisignature authentication keys. A quick primer on how these concepts fit together, since they are very important for clients:
+Two major changes in new Diem design are the [shrinking](https://github.com/diem/diem/issues/2764) of account addresses from 32 bytes to 16 bytes and the addition of multisignature authentication keys. A quick primer on how these concepts fit together, since they are very important for clients:
 
 * To create a fresh account address, generate an ed25519 keypair `(K_pub, K_priv)`.
 * Derive a 32 byte authentication key `auth_key = sha3-256(K_pub | 0)`. The `0` is a signature scheme identifier where `0` means single-signature and `1` means multisig.
 * Each account has an `auth_key` that is checked against the public key included in the transaction in order to authenticate the sender.
 * The account address is the last 16 bytes of `auth_key`
 * The first 16 bytes of `auth_key` is the “auth key prefix”. Any transaction that creates an account needs both an account address and an auth key prefix, but a transaction that is sending funds to an existing account needs only the address.
-* Creating a `K`-of-`N` [multisig](https://github.com/libra/libra/blob/master/crypto/crypto/src/multi_ed25519.rs) authentication key is similar: generate `N` ed25519 public keys, then compute `auth_key = (<concatenated_keys> | K | 1)`. Derive an address and an auth key prefix as described above.
+* Creating a `K`-of-`N` [multisig](https://github.com/diem/diem/blob/master/crypto/crypto/src/multi_ed25519.rs) authentication key is similar: generate `N` ed25519 public keys, then compute `auth_key = (<concatenated_keys> | K | 1)`. Derive an address and an auth key prefix as described above.
 * Diem supports key rotation via changing the `auth_key` stored under an account. The address associated with an account never changes.
 
 ## Exercising New Functionality in Testnet
@@ -37,20 +37,20 @@ Two major changes in new Diem design are the [shrinking](https://github.com/libr
 
 As in the original Diem, testnet has a faucet service for creating accounts and giving money to existing accounts. There are three important changes from the original faucet:
 
-* The faucet now [needs](https://github.com/libra/libra/pull/3972) one of the currency codes above
-* The faucet can accept either a 16 byte address (for an existing account), a 32 byte account authentication key (for an account that does not yet exist and should be created by the faucet). Previously, account addresses and authentication keys were both 32 byte values, but account addresses have [shrunk](https://github.com/libra/libra/issues/2764).
+* The faucet now [needs](https://github.com/diem/diem/pull/3972) one of the currency codes above
+* The faucet can accept either a 16 byte address (for an existing account), a 32 byte account authentication key (for an account that does not yet exist and should be created by the faucet). Previously, account addresses and authentication keys were both 32 byte values, but account addresses have [shrunk](https://github.com/diem/diem/issues/2764).
 * An account created by the faucet has the `ParentVASP` role. Note that in mainnet, only the Association will have the privilege to create `ParentVASP`s, and will do so only for entities that meet appropriate standards.
 
 ### Transactions
 
 Transactions are mostly unchanged from the original design. Two notable differences are:
 
-* Transactions now require a [`gas_currency_code`](https://github.com/libra/libra/blob/master/types/src/transaction/mod.rs#L72) specifying which currency should be used to pay for gas. The account must have a balance in this currency.
-* The signature scheme for a transaction can be either be single-signature ed25519 (as the original design) or multi-ed25519, a new [multisig](https://github.com/libra/libra/issues/2431) format
+* Transactions now require a [`gas_currency_code`](https://github.com/diem/diem/blob/master/types/src/transaction/mod.rs#L72) specifying which currency should be used to pay for gas. The account must have a balance in this currency.
+* The signature scheme for a transaction can be either be single-signature ed25519 (as the original design) or multi-ed25519, a new [multisig](https://github.com/diem/diem/issues/2431) format
 
 ### Payments
 
-Payments can be sent using [this](https://github.com/libra/libra/blob/master/language/stdlib/transaction_scripts/peer_to_peer_with_metadata.move) transaction script. There are a few changes:
+Payments can be sent using [this](https://github.com/diem/diem/blob/master/language/stdlib/transaction_scripts/peer_to_peer_with_metadata.move) transaction script. There are a few changes:
 
 * The script requires a generic type parameter `Token` specifying the currency to be transferred. The sending and receiving account must both have a balance in this currency. A transaction that attempts to send (e.g.) `XDX` to an account that doesn’t have an `XDX` balance will abort.
 * The script has a `metadata` parameter that accepts arbitrary binary data. For most transactions, the metadata should be the subaddress of the VASP customer receiving the payment. The contents of `metadata` are emitted in payment events, but are not otherwise inspected on-chain (so using empty or dummy `metadata` is just fine for testing).
@@ -59,11 +59,11 @@ Payments can be sent using [this](https://github.com/libra/libra/blob/master/lan
 
 ### Creating Child VASP Accounts
 
-As mentioned above, any account created by the faucet has the `ParentVASP` role. You can create a child VASP account from a parent VASP using the [`create_child_vasp_account`](https://github.com/libra/libra/blob/master/language/stdlib/transaction_scripts/create_child_vasp_account.move) transaction script. Attempting to create a child VASP account from another child VASP will abort.
+As mentioned above, any account created by the faucet has the `ParentVASP` role. You can create a child VASP account from a parent VASP using the [`create_child_vasp_account`](https://github.com/diem/diem/blob/master/language/stdlib/transaction_scripts/create_child_vasp_account.move) transaction script. Attempting to create a child VASP account from another child VASP will abort.
 
 ### Adding Currencies to Accounts
 
-Each newly created account accepts at least one currency, which as specified as a currency code type parameter to the account creation script. New currencies can be added to an existing account via the `add_currency_to_account` [script](https://github.com/libra/libra/blob/master/language/stdlib/transaction_scripts/add_currency_to_account.move). In addition, a child VASP account can be prepopulated with all currencies in the system by using the `add_all_currencies` flag in the script above.
+Each newly created account accepts at least one currency, which as specified as a currency code type parameter to the account creation script. New currencies can be added to an existing account via the `add_currency_to_account` [script](https://github.com/diem/diem/blob/master/language/stdlib/transaction_scripts/add_currency_to_account.move). In addition, a child VASP account can be prepopulated with all currencies in the system by using the `add_all_currencies` flag in the script above.
 
 ### Dual Attestation/Travel Rule Protocol
 
@@ -75,7 +75,7 @@ In Diem mainnet every payment transaction between two **distinct **VASP accounts
 
 Details of doing this exchange in production will be published soon, but we will explain how to mock the protocol locally for testing purposes.
 
-Every parent VASP created by the faucet has a dummy `base_url` and  `compliance_public_key`. However, you can use [these](https://github.com/libra/libra/blob/master/language/stdlib/transaction_scripts/rotate_base_url.move) [scripts](https://github.com/libra/libra/blob/master/language/stdlib/transaction_scripts/rotate_compliance_public_key.move) to send a transaction from the parent VASP that sets the URL/key to meaningful values. Once this is done, you can construct the message to be signed and craft a dual attestation transaction with the following ingredients:
+Every parent VASP created by the faucet has a dummy `base_url` and  `compliance_public_key`. However, you can use [these](https://github.com/diem/diem/blob/master/language/stdlib/transaction_scripts/rotate_base_url.move) [scripts](https://github.com/diem/diem/blob/master/language/stdlib/transaction_scripts/rotate_compliance_public_key.move) to send a transaction from the parent VASP that sets the URL/key to meaningful values. Once this is done, you can construct the message to be signed and craft a dual attestation transaction with the following ingredients:
 
 * `payer_vasp_address`: the address of the payer (can be either a parent or child VASP)
 * `payee_vasp_address`: the address of the payee (can be either a parent or child VASP). Encoding: LCS `[u8; 16]`
@@ -84,4 +84,4 @@ Every parent VASP created by the faucet has a dummy `base_url` and  `compliance_
 
 The payee VASP should sign the [LCS](https://developers.diem.com/docs/rustdocs/diem_canonical_serialization/index.html)-encoded (see types above) message `reference_id | payer_vasp_address | amount | @@$$DIEM_ATTEST$$@@`. to produce a `payee_signature`. The `@@$$DIEM_ATTEST$$@@` part is a domain separator intended to  prevent misusing a  different signature from the same key (e.g., interpreting a KYC signature as a travel rule signature).
 
-Finally, send a transaction from payer_vasp_address using the payment [script](https://github.com/libra/libra/blob/master/language/stdlib/transaction_scripts/peer_to_peer_with_metadata.move) mentioned above with `payee = payee_vasp_address, amount = amount, metadata = reference_id, metadata_signature = payee_signature`.
+Finally, send a transaction from payer_vasp_address using the payment [script](https://github.com/diem/diem/blob/master/language/stdlib/transaction_scripts/peer_to_peer_with_metadata.move) mentioned above with `payee = payee_vasp_address, amount = amount, metadata = reference_id, metadata_signature = payee_signature`.
diff --git a/client/faucet/Cargo.toml b/client/faucet/Cargo.toml
index a2633ae83b6c9..08252a9465b4c 100644
--- a/client/faucet/Cargo.toml
+++ b/client/faucet/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-faucet"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem Testnet utility services"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/client/json-rpc/Cargo.toml b/client/json-rpc/Cargo.toml
index 5f5fabe9ef714..899a049c6a7a8 100644
--- a/client/json-rpc/Cargo.toml
+++ b/client/json-rpc/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-json-rpc-client"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem JSONRPC client"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/client/swiss-knife/Cargo.toml b/client/swiss-knife/Cargo.toml
index 38ae624febf06..eb4852e6acdf1 100644
--- a/client/swiss-knife/Cargo.toml
+++ b/client/swiss-knife/Cargo.toml
@@ -3,7 +3,7 @@ name = "swiss-knife"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Tool for generating, serializing (LCS), hashing and signing Diem transactions. Additionally, contains tools for testing"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/client/swiss-knife/README.md b/client/swiss-knife/README.md
index 3b263e76ee2ff..73d0231595a4c 100644
--- a/client/swiss-knife/README.md
+++ b/client/swiss-knife/README.md
@@ -16,7 +16,7 @@ The `sample_inputs` folder contains a list of sample json inputs for various ope
 ## Examples for generate-raw-txn and generate-signed-txn operations
 
 ```
-# Generate a peer_to_peer_transafer raw transaction (https://github.com/libra/libra/blob/1f86705b/language/transaction-builder/src/generated.rs#L447)
+# Generate a peer_to_peer_transafer raw transaction (https://github.com/diem/diem/blob/1f86705b/language/transaction-builder/src/generated.rs#L447)
 # For the txn_params json schema, look at the `struct TxnParams`
 # For the script_params json schema, look at the `struct MoveScriptParams`
 # Note about chain_id: For chain_id parameter, refer to the `enum NamedChain` in `chain_id.rs`. Also, please note that the numeric representation of the chain id ("0", "1", "2", etc.) can also be passed to the chain_id
@@ -42,7 +42,7 @@ $ cargo run -p swiss-knife -- generate-signed-txn < sample_inputs/generate_signe
   }
 }
 
-# Generate a preburn raw transaction (https://github.com/libra/libra/blob/1f86705b/language/transaction-builder/src/generated.rs#L480)
+# Generate a preburn raw transaction (https://github.com/diem/diem/blob/1f86705b/language/transaction-builder/src/generated.rs#L480)
 $ cargo run -p swiss-knife -- generate-raw-txn < sample_inputs/generate_raw_txn_preburn.json
 
 {
diff --git a/client/transaction-builder/Cargo.toml b/client/transaction-builder/Cargo.toml
index b3e7929807078..4198f7e3cf66e 100644
--- a/client/transaction-builder/Cargo.toml
+++ b/client/transaction-builder/Cargo.toml
@@ -3,7 +3,7 @@ name = "transaction-builder-generated"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Generated transaction builders"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/common/bitvec/Cargo.toml b/common/bitvec/Cargo.toml
index 7b70ff375f423..ffbe5909956df 100644
--- a/common/bitvec/Cargo.toml
+++ b/common/bitvec/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-bitvec"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem safe bitvec implementation"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/bounded-executor/Cargo.toml b/common/bounded-executor/Cargo.toml
index 61aef5774466e..dcd03f30c0595 100644
--- a/common/bounded-executor/Cargo.toml
+++ b/common/bounded-executor/Cargo.toml
@@ -3,7 +3,7 @@ name = "bounded-executor"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem bounded executor"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/channel/Cargo.toml b/common/channel/Cargo.toml
index 36f7d7b36868f..d0042378e9ec2 100644
--- a/common/channel/Cargo.toml
+++ b/common/channel/Cargo.toml
@@ -3,7 +3,7 @@ name = "channel"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem channel"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/channel/many-keys-stress-test/Cargo.toml b/common/channel/many-keys-stress-test/Cargo.toml
index 86f6e777aef1a..3289ec4a43fbd 100644
--- a/common/channel/many-keys-stress-test/Cargo.toml
+++ b/common/channel/many-keys-stress-test/Cargo.toml
@@ -3,7 +3,7 @@ name = "many-keys-stress-test"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem channel"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/channel/src/message_queues.rs b/common/channel/src/message_queues.rs
index cd21b617c0811..8882e01039d2b 100644
--- a/common/channel/src/message_queues.rs
+++ b/common/channel/src/message_queues.rs
@@ -183,7 +183,7 @@ impl<K: Eq + Hash + Clone, T> PerKeyQueue<K, T> {
             //
             // See: common/channel/src/bin/many_keys_stress_test.rs
             //
-            // For more context, see: https://github.com/libra/libra/issues/5543
+            // For more context, see: https://github.com/diem/diem/issues/5543
             self.num_popped_since_gc += 1;
             if self.num_popped_since_gc >= POPS_PER_GC {
                 self.num_popped_since_gc = 0;
diff --git a/common/crash-handler/Cargo.toml b/common/crash-handler/Cargo.toml
index 27adee71bcc31..39bb70cbe52e2 100644
--- a/common/crash-handler/Cargo.toml
+++ b/common/crash-handler/Cargo.toml
@@ -3,7 +3,7 @@ name = "crash-handler"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem crash handler"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/datatest-stable/Cargo.toml b/common/datatest-stable/Cargo.toml
index bc15a02d22196..d651b23171d20 100644
--- a/common/datatest-stable/Cargo.toml
+++ b/common/datatest-stable/Cargo.toml
@@ -3,7 +3,7 @@ name = "datatest-stable"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem datatest stable"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/debug-interface/Cargo.toml b/common/debug-interface/Cargo.toml
index d47a42638b8ed..ee634b261cced 100644
--- a/common/debug-interface/Cargo.toml
+++ b/common/debug-interface/Cargo.toml
@@ -3,7 +3,7 @@ name = "debug-interface"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem debug interface"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/diemdoc/Cargo.toml b/common/diemdoc/Cargo.toml
index 35cc65cacdce8..11478b96e2beb 100644
--- a/common/diemdoc/Cargo.toml
+++ b/common/diemdoc/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-documentation-tool"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem transaction-builder"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/common/infallible/Cargo.toml b/common/infallible/Cargo.toml
index c484ba1e66f44..321a7f64660ad 100644
--- a/common/infallible/Cargo.toml
+++ b/common/infallible/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-infallible"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-infallible"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/logger/Cargo.toml b/common/logger/Cargo.toml
index ee84ac272e631..b9ac1b6cf171b 100644
--- a/common/logger/Cargo.toml
+++ b/common/logger/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-logger"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-logger"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/logger/derive/Cargo.toml b/common/logger/derive/Cargo.toml
index a837f3c7cecf3..3407ebc77167d 100644
--- a/common/logger/derive/Cargo.toml
+++ b/common/logger/derive/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-log-derive"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/metrics-core/Cargo.toml b/common/metrics-core/Cargo.toml
index a3e7edd2e5dc7..bcc9e4787ceb2 100644
--- a/common/metrics-core/Cargo.toml
+++ b/common/metrics-core/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-metrics-core"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-metrics-core"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/metrics/Cargo.toml b/common/metrics/Cargo.toml
index 97c07fefd0326..94a8c9b7a0223 100644
--- a/common/metrics/Cargo.toml
+++ b/common/metrics/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-metrics"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-metrics"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/nibble/Cargo.toml b/common/nibble/Cargo.toml
index 79db2a93df812..f6da0591dc70b 100644
--- a/common/nibble/Cargo.toml
+++ b/common/nibble/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-nibble"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-nibble"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/proptest-helpers/Cargo.toml b/common/proptest-helpers/Cargo.toml
index 1d624eb757db7..559fb1faff150 100644
--- a/common/proptest-helpers/Cargo.toml
+++ b/common/proptest-helpers/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-proptest-helpers"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem proptest helpers"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/retrier/Cargo.toml b/common/retrier/Cargo.toml
index db974b80a48df..7c613e9793d3a 100644
--- a/common/retrier/Cargo.toml
+++ b/common/retrier/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-retrier"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem implementation for retries of operations"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/short-hex-str/Cargo.toml b/common/short-hex-str/Cargo.toml
index 067ae561e609e..d163a507636af 100644
--- a/common/short-hex-str/Cargo.toml
+++ b/common/short-hex-str/Cargo.toml
@@ -3,7 +3,7 @@ name = "short-hex-str"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem implementation for retries of operations"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/subscription-service/Cargo.toml b/common/subscription-service/Cargo.toml
index 00f8e518323f0..6a4966c6229d4 100644
--- a/common/subscription-service/Cargo.toml
+++ b/common/subscription-service/Cargo.toml
@@ -3,7 +3,7 @@ name = "subscription-service"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem subscription service"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/temppath/Cargo.toml b/common/temppath/Cargo.toml
index 3dfdef358283f..05b396b93e3d2 100644
--- a/common/temppath/Cargo.toml
+++ b/common/temppath/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-temppath"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-temppath"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/trace/Cargo.toml b/common/trace/Cargo.toml
index 5470df6a25895..0e4317acab882 100644
--- a/common/trace/Cargo.toml
+++ b/common/trace/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-trace"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-trace"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/common/workspace-hack/Cargo.toml b/common/workspace-hack/Cargo.toml
index 2bafbc004db58..1b9d7ad0819d6 100644
--- a/common/workspace-hack/Cargo.toml
+++ b/common/workspace-hack/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-workspace-hack"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem workspace hack"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/config/Cargo.toml b/config/Cargo.toml
index a30cd71643373..fe9b67e82b5d7 100644
--- a/config/Cargo.toml
+++ b/config/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-config"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-config"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/config/generate-key/Cargo.toml b/config/generate-key/Cargo.toml
index 8ec110a1cb358..33da70c170476 100644
--- a/config/generate-key/Cargo.toml
+++ b/config/generate-key/Cargo.toml
@@ -3,7 +3,7 @@ name = "generate-key"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem generate key"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/config/global-constants/Cargo.toml b/config/global-constants/Cargo.toml
index 06abf39a819b1..36afd1a3e92cf 100644
--- a/config/global-constants/Cargo.toml
+++ b/config/global-constants/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-global-constants"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem's global constant crate: the source of truth for constant definitions that span multiple crates"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/config/management/Cargo.toml b/config/management/Cargo.toml
index 7b50951840ab9..819d36d3c8398 100644
--- a/config/management/Cargo.toml
+++ b/config/management/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-management"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem Management is a tool used to manage the configuration of a Diem Node"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/config/management/genesis/Cargo.toml b/config/management/genesis/Cargo.toml
index f3511557ab316..bbe4841fa92ab 100644
--- a/config/management/genesis/Cargo.toml
+++ b/config/management/genesis/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-genesis-tool"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "A tool to manage genesis"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/config/management/network-address-encryption/Cargo.toml b/config/management/network-address-encryption/Cargo.toml
index 54e10d8b38c3a..db71077afdfc2 100644
--- a/config/management/network-address-encryption/Cargo.toml
+++ b/config/management/network-address-encryption/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-network-address-encryption"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Encryption library for network addresses"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/config/management/operational/Cargo.toml b/config/management/operational/Cargo.toml
index 584d20eb1019c..4b7a995ea0e45 100644
--- a/config/management/operational/Cargo.toml
+++ b/config/management/operational/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-operational-tool"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem Management is a tool for operators to manage nodes"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/config/seed-peer-generator/Cargo.toml b/config/seed-peer-generator/Cargo.toml
index 65e3c8f560e85..744da4e5a3dec 100644
--- a/config/seed-peer-generator/Cargo.toml
+++ b/config/seed-peer-generator/Cargo.toml
@@ -3,7 +3,7 @@ name = "seed-peer-generator"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem seed peer generator"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
index 5e97608dce670..5062434d0ebd3 100644
--- a/consensus/Cargo.toml
+++ b/consensus/Cargo.toml
@@ -3,7 +3,7 @@ name = "consensus"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem consensus"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/consensus/README.md b/consensus/README.md
index 7f56c4bed6124..9884af44348c6 100644
--- a/consensus/README.md
+++ b/consensus/README.md
@@ -1,7 +1,7 @@
 ---
 id: consensus
 title: Consensus
-custom_edit_url: https://github.com/libra/libra/edit/master/consensus/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/consensus/README.md
 ---
 
 
diff --git a/consensus/src/twins/basic_twins_test.rs b/consensus/src/twins/basic_twins_test.rs
index 78554280cb31b..6f092b09205c8 100644
--- a/consensus/src/twins/basic_twins_test.rs
+++ b/consensus/src/twins/basic_twins_test.rs
@@ -254,7 +254,7 @@ fn twins_proposer_test() {
 }
 
 #[test]
-#[ignore] // TODO: https://github.com/libra/libra/issues/6615
+#[ignore] // TODO: https://github.com/diem/diem/issues/6615
 /// This test checks that when a node and its twin are both leaders
 /// for a round, only one of the two proposals gets committed
 ///
diff --git a/crypto/crypto-derive/Cargo.toml b/crypto/crypto-derive/Cargo.toml
index 6d4c9aea8400c..7e0915e75e107 100644
--- a/crypto/crypto-derive/Cargo.toml
+++ b/crypto/crypto-derive/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-crypto-derive"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem custom derives for `diem-crypto`"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/crypto/crypto/Cargo.toml b/crypto/crypto/Cargo.toml
index 034c17ec166ec..4b4acfedea6ba 100644
--- a/crypto/crypto/Cargo.toml
+++ b/crypto/crypto/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-crypto"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-crypto"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/crypto/crypto/README.md b/crypto/crypto/README.md
index a81b9c4883a3e..0b731e4a1ef66 100644
--- a/crypto/crypto/README.md
+++ b/crypto/crypto/README.md
@@ -1,7 +1,7 @@
 ---
 id: crypto
 title: Crypto
-custom_edit_url: https://github.com/libra/libra/edit/master/crypto/crypto/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/crypto/crypto/README.md
 ---
 
 The crypto component hosts all the implementations of cryptographic primitives we use in Diem: hashing, signing, and key derivation/generation. The parts of the library using traits.rs contains the crypto API enforcing type safety, verifiable random functions, EdDSA & MultiEdDSA signatures.
diff --git a/diem-node/Cargo.toml b/diem-node/Cargo.toml
index 4552d9090cae7..66f4b18e80047 100644
--- a/diem-node/Cargo.toml
+++ b/diem-node/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-node"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem node"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/docker/compose/README.md b/docker/compose/README.md
index 040bc9a666f8a..449e5581ab41e 100644
--- a/docker/compose/README.md
+++ b/docker/compose/README.md
@@ -1,7 +1,7 @@
 ---
 id: docker_compose
 title: Diem Docker-Compose Configuration
-custom_edit_url: https://github.com/libra/libra/edit/master/docker/compose/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/docker/compose/README.md
 ---
 
 This directory contains the following compose configurations:
diff --git a/execution/README.md b/execution/README.md
index e3e5b77f07993..e678dc2e59128 100644
--- a/execution/README.md
+++ b/execution/README.md
@@ -1,7 +1,7 @@
 ---
 id: executor
 title: Executor
-custom_edit_url: https://github.com/libra/libra/edit/master/executor/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/executor/README.md
 ---
 
 
diff --git a/execution/db-bootstrapper/Cargo.toml b/execution/db-bootstrapper/Cargo.toml
index d20cd6bc2b728..c28803a324177 100644
--- a/execution/db-bootstrapper/Cargo.toml
+++ b/execution/db-bootstrapper/Cargo.toml
@@ -3,7 +3,7 @@ name = "db-bootstrapper"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem DB-Bootstrapper."
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/execution/executor-benchmark/Cargo.toml b/execution/executor-benchmark/Cargo.toml
index 0955ba91ad93b..eaf70a497e2d4 100644
--- a/execution/executor-benchmark/Cargo.toml
+++ b/execution/executor-benchmark/Cargo.toml
@@ -3,7 +3,7 @@ name = "executor-benchmark"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem executor benchmark"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/execution/executor-test-helpers/Cargo.toml b/execution/executor-test-helpers/Cargo.toml
index c9dbdbcf3edd6..b0753f4655a9a 100644
--- a/execution/executor-test-helpers/Cargo.toml
+++ b/execution/executor-test-helpers/Cargo.toml
@@ -3,7 +3,7 @@ name = "executor-test-helpers"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem executor test helpers"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/execution/executor-types/Cargo.toml b/execution/executor-types/Cargo.toml
index a2c561e4765be..6d4d4fa3d058d 100644
--- a/execution/executor-types/Cargo.toml
+++ b/execution/executor-types/Cargo.toml
@@ -3,7 +3,7 @@ name = "executor-types"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem executor interface types"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/execution/executor/Cargo.toml b/execution/executor/Cargo.toml
index a8ae43eae0196..8f86e0c8abd68 100644
--- a/execution/executor/Cargo.toml
+++ b/execution/executor/Cargo.toml
@@ -3,7 +3,7 @@ name = "executor"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem executor"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/json-rpc/Cargo.toml b/json-rpc/Cargo.toml
index baab39476a100..dfcfb597605e6 100644
--- a/json-rpc/Cargo.toml
+++ b/json-rpc/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-json-rpc"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem rpc endpoint"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/json-rpc/types/Cargo.toml b/json-rpc/types/Cargo.toml
index 6e73ce7fbca1c..6c53c370b9305 100644
--- a/json-rpc/types/Cargo.toml
+++ b/json-rpc/types/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-json-rpc-types"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem JSONRPC Types"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/README.md b/language/README.md
index c99f7c524914d..3fed264802ce3 100644
--- a/language/README.md
+++ b/language/README.md
@@ -1,7 +1,7 @@
 ---
 id: move-language
 title: Move Language
-custom_edit_url: https://github.com/libra/libra/edit/master/language/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/README.md
 ---
 
 
diff --git a/language/benchmarks/Cargo.toml b/language/benchmarks/Cargo.toml
index b0525c5671207..eceb734d2cf67 100644
--- a/language/benchmarks/Cargo.toml
+++ b/language/benchmarks/Cargo.toml
@@ -3,7 +3,7 @@ name = "language-benchmarks"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem language benchmarks"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/bytecode-verifier/Cargo.toml b/language/bytecode-verifier/Cargo.toml
index 781f5bfa3b859..fffeeba5102cc 100644
--- a/language/bytecode-verifier/Cargo.toml
+++ b/language/bytecode-verifier/Cargo.toml
@@ -3,7 +3,7 @@ name = "bytecode-verifier"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem bytecode verifier"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/bytecode-verifier/README.md b/language/bytecode-verifier/README.md
index 6fd0967f29978..7dfc93c1480a5 100644
--- a/language/bytecode-verifier/README.md
+++ b/language/bytecode-verifier/README.md
@@ -1,7 +1,7 @@
 ---
 id: bytecode-verifier
 title: Bytecode Verifier
-custom_edit_url: https://github.com/libra/libra/edit/master/language/bytecode-verifier/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/bytecode-verifier/README.md
 ---
 
 
diff --git a/language/bytecode-verifier/bytecode-verifier-tests/Cargo.toml b/language/bytecode-verifier/bytecode-verifier-tests/Cargo.toml
index 3bba6da02487a..08c4af3b8a8cc 100644
--- a/language/bytecode-verifier/bytecode-verifier-tests/Cargo.toml
+++ b/language/bytecode-verifier/bytecode-verifier-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "bytecode-verifier-tests"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem bytecode verifier tests"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/bytecode-verifier/invalid-mutations/Cargo.toml b/language/bytecode-verifier/invalid-mutations/Cargo.toml
index dee1a772805a1..0bb1097495859 100644
--- a/language/bytecode-verifier/invalid-mutations/Cargo.toml
+++ b/language/bytecode-verifier/invalid-mutations/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem invalid mutations"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/compiler/Cargo.toml b/language/compiler/Cargo.toml
index 29722aea8e8d1..7db72154c5442 100644
--- a/language/compiler/Cargo.toml
+++ b/language/compiler/Cargo.toml
@@ -3,7 +3,7 @@ name = "compiler"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem compiler"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/compiler/README.md b/language/compiler/README.md
index abfa2272d259a..b91bac535c83d 100644
--- a/language/compiler/README.md
+++ b/language/compiler/README.md
@@ -1,7 +1,7 @@
 ---
 id: ir-to-bytecode
 title: Move IR Compiler
-custom_edit_url: https://github.com/libra/libra/edit/master/language/compiler/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/compiler/README.md
 ---
 
 
@@ -14,7 +14,7 @@ The Move IR compiler compiles the Move IR down to its bytecode representation.
 The Move IR compiler compiles modules and scripts written in Move down to
 their respective bytecode representations. The two data types used to
 represent these outputs are `CompiledModule` and `CompiledScript`. These
-data types are defined in [file_format.rs](https://github.com/libra/libra/blob/master/language/vm/src/file_format.rs).
+data types are defined in [file_format.rs](https://github.com/diem/diem/blob/master/language/vm/src/file_format.rs).
 
 Beyond translating Move IR to Move bytecode, the compiler's purpose is as a
 testing tool for the bytecode verifier. Because of this, its job is to
@@ -24,7 +24,7 @@ performed during the compilation process. In fact, the compiler goes out of
 its way to push these semantic checks into the bytecode, and compile
 semantically invalid code in the Move IR to equivalent---semantically
 invalid---bytecode programs. The semantics of the compiled bytecode is
-then verified by the [bytecode verifier](https://github.com/libra/libra/blob/master/language/bytecode-verifier/README.md). The compiler command line
+then verified by the [bytecode verifier](https://github.com/diem/diem/blob/master/language/bytecode-verifier/README.md). The compiler command line
 automatically calls the bytecode verifier at the end of compilation.
 
 ## Command-line options
diff --git a/language/compiler/ir-to-bytecode/Cargo.toml b/language/compiler/ir-to-bytecode/Cargo.toml
index b6db99ea96bce..f989bf282d5a7 100644
--- a/language/compiler/ir-to-bytecode/Cargo.toml
+++ b/language/compiler/ir-to-bytecode/Cargo.toml
@@ -3,7 +3,7 @@ name = "ir-to-bytecode"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem ir to bytecode"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/compiler/ir-to-bytecode/syntax/Cargo.toml b/language/compiler/ir-to-bytecode/syntax/Cargo.toml
index 7c9fda0ac11a6..6ddcca6b84223 100644
--- a/language/compiler/ir-to-bytecode/syntax/Cargo.toml
+++ b/language/compiler/ir-to-bytecode/syntax/Cargo.toml
@@ -3,7 +3,7 @@ name = "ir-to-bytecode-syntax"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem ir to bytecode syntax"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/diem-tools/diem-events-fetcher/Cargo.toml b/language/diem-tools/diem-events-fetcher/Cargo.toml
index fd82dd046f263..2d05621a68d1b 100644
--- a/language/diem-tools/diem-events-fetcher/Cargo.toml
+++ b/language/diem-tools/diem-events-fetcher/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-events-fetcher"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Generating writesets used for incident management"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/diem-tools/diem-validator-interface/Cargo.toml b/language/diem-tools/diem-validator-interface/Cargo.toml
index dec0559557a5a..cffc2a46fcd01 100644
--- a/language/diem-tools/diem-validator-interface/Cargo.toml
+++ b/language/diem-tools/diem-validator-interface/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-validator-interface"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Defines interfaces between the diem nodes and local move infrastructure"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/diem-tools/transaction-replay/Cargo.toml b/language/diem-tools/transaction-replay/Cargo.toml
index a63c87598e5e7..1b3d4be0eb67b 100644
--- a/language/diem-tools/transaction-replay/Cargo.toml
+++ b/language/diem-tools/transaction-replay/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-transaction-replay"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Replay transactions stored on chain"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/diem-tools/writeset-transaction-generator/Cargo.toml b/language/diem-tools/writeset-transaction-generator/Cargo.toml
index 9778963d4341f..b69a775ddf0e5 100644
--- a/language/diem-tools/writeset-transaction-generator/Cargo.toml
+++ b/language/diem-tools/writeset-transaction-generator/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-writeset-generator"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Generating writesets used for incident management"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/diem-vm/Cargo.toml b/language/diem-vm/Cargo.toml
index 2c715a1e66725..d5523efc6cf0d 100644
--- a/language/diem-vm/Cargo.toml
+++ b/language/diem-vm/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-vm"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem VM runtime"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/diem-vm/README.md b/language/diem-vm/README.md
index d1eabf7a45fac..74dda4bfbff66 100644
--- a/language/diem-vm/README.md
+++ b/language/diem-vm/README.md
@@ -1,7 +1,7 @@
 ---
 id: vm-runtime
 title: MoveVM Runtime
-custom_edit_url: https://github.com/libra/libra/edit/master/language/vm/vm-runtime/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/vm/vm-runtime/README.md
 ---
 
 # MoveVM Runtime
diff --git a/language/e2e-testsuite/Cargo.toml b/language/e2e-testsuite/Cargo.toml
index 01719cdc98e12..12cf8fa51d4a2 100644
--- a/language/e2e-testsuite/Cargo.toml
+++ b/language/e2e-testsuite/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem language e2e tests"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/ir-testsuite/Cargo.toml b/language/ir-testsuite/Cargo.toml
index c0a5405f55872..5903f94fe6727 100644
--- a/language/ir-testsuite/Cargo.toml
+++ b/language/ir-testsuite/Cargo.toml
@@ -3,7 +3,7 @@ name = "ir-testsuite"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem functional tests"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/language/move-core/types/Cargo.toml b/language/move-core/types/Cargo.toml
index 2c45c73b58494..d0c2acf861802 100644
--- a/language/move-core/types/Cargo.toml
+++ b/language/move-core/types/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-core-types"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Core types for Move"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/move-core/types/src/account_address.rs b/language/move-core/types/src/account_address.rs
index f6a639876cc21..f05fdf9b95da0 100644
--- a/language/move-core/types/src/account_address.rs
+++ b/language/move-core/types/src/account_address.rs
@@ -92,7 +92,7 @@ impl AccountAddress {
     // from consensus key which is of type Ed25519PublicKey. Since AccountAddress does
     // not mean anything in a setting without remote authentication, we use the network
     // public key to generate a peer_id for the peer.
-    // See this issue for potential improvements: https://github.com/libra/libra/issues/3960
+    // See this issue for potential improvements: https://github.com/diem/diem/issues/3960
     pub fn from_identity_public_key(identity_public_key: x25519::PublicKey) -> Self {
         let mut array = [0u8; Self::LENGTH];
         let pubkey_slice = identity_public_key.as_slice();
diff --git a/language/move-ir/types/Cargo.toml b/language/move-ir/types/Cargo.toml
index 494d72413ec34..05ac91bd24337 100644
--- a/language/move-ir/types/Cargo.toml
+++ b/language/move-ir/types/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-ir-types"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Types for Move IR"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/language/move-lang/README.md b/language/move-lang/README.md
index 7e7169a4ded1d..e6c11368f8f3e 100644
--- a/language/move-lang/README.md
+++ b/language/move-lang/README.md
@@ -1,7 +1,7 @@
 ---
 id: move-lang
 title: Move Source Language
-custom_edit_url: https://github.com/libra/libra/edit/master/language/move-lang/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/move-lang/README.md
 ---
 
 ## Code under this subtree is experimental. It is out of scope for the Diem Bug Bounty until it is no longer marked experimental.
diff --git a/language/move-prover/README.md b/language/move-prover/README.md
index d5900f8444879..36140722b304c 100644
--- a/language/move-prover/README.md
+++ b/language/move-prover/README.md
@@ -1,7 +1,7 @@
 ---
 id: move-prover
 title: Formal verification code
-custom_edit_url: https://github.com/libra/libra/edit/master/language/move-prover/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/move-prover/README.md
 ---
 
 
diff --git a/language/move-prover/bytecode/Cargo.toml b/language/move-prover/bytecode/Cargo.toml
index d267fb5493cb6..9f104355445b4 100644
--- a/language/move-prover/bytecode/Cargo.toml
+++ b/language/move-prover/bytecode/Cargo.toml
@@ -3,7 +3,7 @@ name = "bytecode"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem stackless bytecode generator"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/move-prover/tests/testsuite.rs b/language/move-prover/tests/testsuite.rs
index 630a37820d66f..359f1dd0d2ed9 100644
--- a/language/move-prover/tests/testsuite.rs
+++ b/language/move-prover/tests/testsuite.rs
@@ -45,7 +45,7 @@ fn test_runner(path: &Path) -> datatest_stable::Result<()> {
         if !NOT_CONFIGURED_WARNED.compare_and_swap(false, true, Ordering::Relaxed) {
             warn!(
                 "Prover tools are not configured, verification tests will be skipped. \
-        See https://github.com/libra/libra/tree/master/language/move-prover/doc/user/install.md \
+        See https://github.com/diem/diem/tree/master/language/move-prover/doc/user/install.md \
         for instructions."
             );
         }
diff --git a/language/move-vm/integration-tests/Cargo.toml b/language/move-vm/integration-tests/Cargo.toml
index 578730e500f87..acec7303ccdbf 100644
--- a/language/move-vm/integration-tests/Cargo.toml
+++ b/language/move-vm/integration-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-vm-integration-tests"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Move VM Integration Tests"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/move-vm/natives/Cargo.toml b/language/move-vm/natives/Cargo.toml
index a2c46d68e61fb..df9c17d61a37f 100644
--- a/language/move-vm/natives/Cargo.toml
+++ b/language/move-vm/natives/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-vm-natives"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Move VM native functions"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/move-vm/runtime/Cargo.toml b/language/move-vm/runtime/Cargo.toml
index e6bc6ea53ccb9..8e8c2fa538783 100644
--- a/language/move-vm/runtime/Cargo.toml
+++ b/language/move-vm/runtime/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-vm-runtime"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Core Move execution logic"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/move-vm/test-utils/Cargo.toml b/language/move-vm/test-utils/Cargo.toml
index d953f32ef7263..06e517dbdddee 100644
--- a/language/move-vm/test-utils/Cargo.toml
+++ b/language/move-vm/test-utils/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-vm-test-utils"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Move VM Test Utils"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/move-vm/types/Cargo.toml b/language/move-vm/types/Cargo.toml
index dadd56b346ee3..7b3c10fd71f49 100644
--- a/language/move-vm/types/Cargo.toml
+++ b/language/move-vm/types/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-vm-types"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Types for Move VM"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/stdlib/Cargo.toml b/language/stdlib/Cargo.toml
index 4b984ec44c9ef..da91c5d9e8593 100644
--- a/language/stdlib/Cargo.toml
+++ b/language/stdlib/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem stdlib"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/stdlib/README.md b/language/stdlib/README.md
index df4ea374fbc3e..820950889f66a 100644
--- a/language/stdlib/README.md
+++ b/language/stdlib/README.md
@@ -1,7 +1,7 @@
 ---
 id: diem-framework
 title: Diem Framework
-custom_edit_url: https://github.com/libra/libra/edit/master/language/stdlib/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/stdlib/README.md
 ---
 
 ## The Diem Framework
diff --git a/language/stdlib/compiled/Cargo.toml b/language/stdlib/compiled/Cargo.toml
index f4963e4478878..db000af88b67d 100644
--- a/language/stdlib/compiled/Cargo.toml
+++ b/language/stdlib/compiled/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem stdlib"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/stdlib/modules/LCS.move b/language/stdlib/modules/LCS.move
index 33a9034ff6c6d..cac6e7a2fa655 100644
--- a/language/stdlib/modules/LCS.move
+++ b/language/stdlib/modules/LCS.move
@@ -1,7 +1,7 @@
 address 0x1 {
 /// Utility for converting a Move value to its binary representation in LCS (Diem Canonical
 /// Serialization). LCS is the binary encoding for Move resources and other non-module values
-/// published on-chain. See https://github.com/libra/libra/tree/master/common/lcs for more
+/// published on-chain. See https://github.com/diem/diem/tree/master/common/lcs for more
 /// details on LCS.
 module LCS {
     /// Return the binary representation of `v` in LCS (Diem Canonical Serialization) format
diff --git a/language/stdlib/modules/doc/LCS.md b/language/stdlib/modules/doc/LCS.md
index 5b550c120577f..c115cb0bcab35 100644
--- a/language/stdlib/modules/doc/LCS.md
+++ b/language/stdlib/modules/doc/LCS.md
@@ -5,7 +5,7 @@
 
 Utility for converting a Move value to its binary representation in LCS (Diem Canonical
 Serialization). LCS is the binary encoding for Move resources and other non-module values
-published on-chain. See https://github.com/libra/libra/tree/master/common/lcs for more
+published on-chain. See https://github.com/diem/diem/tree/master/common/lcs for more
 details on LCS.
 
 
diff --git a/language/stdlib/transaction_scripts/doc/spec_documentation.md b/language/stdlib/transaction_scripts/doc/spec_documentation.md
index 77d4de96c9aa7..62506d5d5888e 100644
--- a/language/stdlib/transaction_scripts/doc/spec_documentation.md
+++ b/language/stdlib/transaction_scripts/doc/spec_documentation.md
@@ -7,8 +7,8 @@
 [FORM_VER]: https://en.wikipedia.org/wiki/Formal_verification
 [SMT]: https://en.wikipedia.org/wiki/Satisfiability_modulo_theories
 [DESIGN_BY_CONTRACT]: https://en.wikipedia.org/wiki/Design_by_contract
-[MSL]: https://github.com/libra/libra/blob/master/language/move-prover/doc/user/spec-lang.md
-[PROVER]: https://github.com/libra/libra/blob/master/language/move-prover/doc/user/prover-guide.md
+[MSL]: https://github.com/diem/diem/blob/master/language/move-prover/doc/user/spec-lang.md
+[PROVER]: https://github.com/diem/diem/blob/master/language/move-prover/doc/user/prover-guide.md
 [BOOGIE]: https://github.com/boogie-org/boogie
 [Z3]: https://github.com/Z3Prover/z3
 [ACCESS_CONTROL]: https://github.com/libra/lip/blob/master/lips/lip-2.md
diff --git a/language/stdlib/transaction_scripts/doc/transaction_script_documentation.md b/language/stdlib/transaction_scripts/doc/transaction_script_documentation.md
index 92cad97132782..c44d1721b0fa8 100644
--- a/language/stdlib/transaction_scripts/doc/transaction_script_documentation.md
+++ b/language/stdlib/transaction_scripts/doc/transaction_script_documentation.md
@@ -113,7 +113,7 @@ on-chain. These statuses and errors can be categorized into two buckets:
 
 There are also a number of statuses that can be returned at the time of
 submission of the transaction to the system through JSON-RPC, these are detailed in the
-[JSON-RPC specification](https://github.com/libra/libra/blob/master/json-rpc/docs/method_submit.md#errors).
+[JSON-RPC specification](https://github.com/diem/diem/blob/master/json-rpc/docs/method_submit.md#errors).
 
 
 <a name="@Predefined_Statuses_2"></a>
@@ -179,11 +179,11 @@ to these may occur without notice, but changes are not expected to be common.
 The abort conditions detailed in each transaction script are not meant to
 be complete, but the list of error categories are. Additionally, any abort conditions
 raised will have a human readable explanation attached to it (if possible) in the
-[response](https://github.com/libra/libra/blob/master/json-rpc/docs/type_transaction.md#type-moveabortexplanation)
+[response](https://github.com/diem/diem/blob/master/json-rpc/docs/type_transaction.md#type-moveabortexplanation)
 from a
-[JSON-RPC query for a committed transaction](https://github.com/libra/libra/blob/master/json-rpc/json-rpc-spec.md).
+[JSON-RPC query for a committed transaction](https://github.com/diem/diem/blob/master/json-rpc/json-rpc-spec.md).
 These explanations are based off of the human-understandable explanations provided by the
-[Move Explain](https://github.com/libra/libra/tree/master/language/tools/move-explain)
+[Move Explain](https://github.com/diem/diem/tree/master/language/tools/move-explain)
 tool which can also be called on the command-line.
 
 
diff --git a/language/stdlib/transaction_scripts/spec_documentation_template.md b/language/stdlib/transaction_scripts/spec_documentation_template.md
index 8d0417e4d6200..64a88e3330402 100644
--- a/language/stdlib/transaction_scripts/spec_documentation_template.md
+++ b/language/stdlib/transaction_scripts/spec_documentation_template.md
@@ -3,8 +3,8 @@
 [FORM_VER]: https://en.wikipedia.org/wiki/Formal_verification
 [SMT]: https://en.wikipedia.org/wiki/Satisfiability_modulo_theories
 [DESIGN_BY_CONTRACT]: https://en.wikipedia.org/wiki/Design_by_contract
-[MSL]: https://github.com/libra/libra/blob/master/language/move-prover/doc/user/spec-lang.md
-[PROVER]: https://github.com/libra/libra/blob/master/language/move-prover/doc/user/prover-guide.md
+[MSL]: https://github.com/diem/diem/blob/master/language/move-prover/doc/user/spec-lang.md
+[PROVER]: https://github.com/diem/diem/blob/master/language/move-prover/doc/user/prover-guide.md
 [BOOGIE]: https://github.com/boogie-org/boogie
 [Z3]: https://github.com/Z3Prover/z3
 [ACCESS_CONTROL]: https://github.com/libra/lip/blob/master/lips/lip-2.md
diff --git a/language/stdlib/transaction_scripts/transaction_script_documentation_template.md b/language/stdlib/transaction_scripts/transaction_script_documentation_template.md
index 66d1f300360b2..5f8a6ff698ac3 100644
--- a/language/stdlib/transaction_scripts/transaction_script_documentation_template.md
+++ b/language/stdlib/transaction_scripts/transaction_script_documentation_template.md
@@ -19,7 +19,7 @@ on-chain. These statuses and errors can be categorized into two buckets:
 
 There are also a number of statuses that can be returned at the time of
 submission of the transaction to the system through JSON-RPC, these are detailed in the
-[JSON-RPC specification](https://github.com/libra/libra/blob/master/json-rpc/docs/method_submit.md#errors).
+[JSON-RPC specification](https://github.com/diem/diem/blob/master/json-rpc/docs/method_submit.md#errors).
 
 ### Predefined Statuses
 
@@ -73,11 +73,11 @@ to these may occur without notice, but changes are not expected to be common.
 The abort conditions detailed in each transaction script are not meant to
 be complete, but the list of error categories are. Additionally, any abort conditions
 raised will have a human readable explanation attached to it (if possible) in the
-[response](https://github.com/libra/libra/blob/master/json-rpc/docs/type_transaction.md#type-moveabortexplanation)
+[response](https://github.com/diem/diem/blob/master/json-rpc/docs/type_transaction.md#type-moveabortexplanation)
 from a
-[JSON-RPC query for a committed transaction](https://github.com/libra/libra/blob/master/json-rpc/json-rpc-spec.md).
+[JSON-RPC query for a committed transaction](https://github.com/diem/diem/blob/master/json-rpc/json-rpc-spec.md).
 These explanations are based off of the human-understandable explanations provided by the
-[Move Explain](https://github.com/libra/libra/tree/master/language/tools/move-explain)
+[Move Explain](https://github.com/diem/diem/tree/master/language/tools/move-explain)
 tool which can also be called on the command-line.
 
 ### Specifications
diff --git a/language/testing-infra/e2e-tests/Cargo.toml b/language/testing-infra/e2e-tests/Cargo.toml
index 270230a66b079..2b10c44ccf4da 100644
--- a/language/testing-infra/e2e-tests/Cargo.toml
+++ b/language/testing-infra/e2e-tests/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem language e2e testing framework"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/testing-infra/functional-tests/Cargo.toml b/language/testing-infra/functional-tests/Cargo.toml
index f51efb629751a..e65c1cb0f57f8 100644
--- a/language/testing-infra/functional-tests/Cargo.toml
+++ b/language/testing-infra/functional-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "functional-tests"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem functional tests"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/language/testing-infra/module-generation/Cargo.toml b/language/testing-infra/module-generation/Cargo.toml
index 5b88491e1674b..62ecac1727512 100644
--- a/language/testing-infra/module-generation/Cargo.toml
+++ b/language/testing-infra/module-generation/Cargo.toml
@@ -3,7 +3,7 @@ name = "module-generation"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem binary module generation"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/testing-infra/test-generation/Cargo.toml b/language/testing-infra/test-generation/Cargo.toml
index 5dc2ee73e8fb2..723d96e400229 100644
--- a/language/testing-infra/test-generation/Cargo.toml
+++ b/language/testing-infra/test-generation/Cargo.toml
@@ -3,7 +3,7 @@ name = "test-generation"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem test generation"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/testing-infra/test-generation/README.md b/language/testing-infra/test-generation/README.md
index dcbdae62f8c72..5c8902851bc54 100644
--- a/language/testing-infra/test-generation/README.md
+++ b/language/testing-infra/test-generation/README.md
@@ -1,7 +1,7 @@
 ---
 id: bytecode-test-generation
 title: Bytecode Test Generation Tool
-custom_edit_url: https://github.com/libra/libra/edit/master/language/testing-infra/test-generation/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/testing-infra/test-generation/README.md
 ---
 
 # Bytecode Test Generation Tool
diff --git a/language/tools/genesis-viewer/Cargo.toml b/language/tools/genesis-viewer/Cargo.toml
index 026a70de7eacf..19beff94a6049 100644
--- a/language/tools/genesis-viewer/Cargo.toml
+++ b/language/tools/genesis-viewer/Cargo.toml
@@ -3,7 +3,7 @@ name = "genesis-viewer"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem genesis viewer"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/tools/move-cli/Cargo.toml b/language/tools/move-cli/Cargo.toml
index c9a9126e0587d..8f373330469d1 100644
--- a/language/tools/move-cli/Cargo.toml
+++ b/language/tools/move-cli/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-cli"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "CLI frontend for the Move compiler and VM"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/tools/move-cli/README.md b/language/tools/move-cli/README.md
index 48ebf24059ac0..15ab844bff216 100644
--- a/language/tools/move-cli/README.md
+++ b/language/tools/move-cli/README.md
@@ -10,7 +10,7 @@ $ cargo install --path diem/language/tools/move-cli
 ```
 or
 ```shell
-$ cargo install --git https://github.com/libra/libra move-cli
+$ cargo install --git https://github.com/diem/diem move-cli
 ```
 
 This will install the `move` binary in your Cargo binary directory. On
@@ -432,19 +432,19 @@ are the following:
 * **stdlib:** This includes a small set of utility modules published under the
   `0x1` address. **This is the default mode if no mode is supplied**. The set of
   Move modules that are included in this mode are the following:
-  [`Debug`](https://github.com/libra/libra/blob/master/language/stdlib/nursery/Debug.move),
-  [`Errors`](https://github.com/libra/libra/blob/master/language/stdlib/modules/Errors.move),
-  [`Event`](https://github.com/libra/libra/blob/master/language/stdlib/modules/Event.move),
-  [`FixedPoint32`](https://github.com/libra/libra/blob/master/language/stdlib/modules/FixedPoint32.move),
-  [`Hash`](https://github.com/libra/libra/blob/master/language/stdlib/modules/Hash.move),
-  [`LCS`](https://github.com/libra/libra/blob/master/language/stdlib/modules/LCS.move),
-  [`Option`](https://github.com/libra/libra/blob/master/language/stdlib/modules/Option.move),
-  [`Vector`](https://github.com/libra/libra/blob/master/language/stdlib/modules/Vector.move), and
-  [`Signer`](https://github.com/libra/libra/blob/master/language/stdlib/modules/Signer.move).
+  [`Debug`](https://github.com/diem/diem/blob/master/language/stdlib/nursery/Debug.move),
+  [`Errors`](https://github.com/diem/diem/blob/master/language/stdlib/modules/Errors.move),
+  [`Event`](https://github.com/diem/diem/blob/master/language/stdlib/modules/Event.move),
+  [`FixedPoint32`](https://github.com/diem/diem/blob/master/language/stdlib/modules/FixedPoint32.move),
+  [`Hash`](https://github.com/diem/diem/blob/master/language/stdlib/modules/Hash.move),
+  [`LCS`](https://github.com/diem/diem/blob/master/language/stdlib/modules/LCS.move),
+  [`Option`](https://github.com/diem/diem/blob/master/language/stdlib/modules/Option.move),
+  [`Vector`](https://github.com/diem/diem/blob/master/language/stdlib/modules/Vector.move), and
+  [`Signer`](https://github.com/diem/diem/blob/master/language/stdlib/modules/Signer.move).
 
 * **diem:** This includes all of the modules in the `stdlib` mode, along with
   all of the other modules that comprise the Diem Framework as defined
-  [here](https://github.com/libra/libra/blob/master/language/stdlib/modules/doc/overview.md).
+  [here](https://github.com/diem/diem/blob/master/language/stdlib/modules/doc/overview.md).
 
 ### Running with genesis state
 
diff --git a/language/tools/move-coverage/Cargo.toml b/language/tools/move-coverage/Cargo.toml
index 3fd681d592976..90d1b02fe6dd4 100644
--- a/language/tools/move-coverage/Cargo.toml
+++ b/language/tools/move-coverage/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-coverage"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem Move VM code coverage"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/tools/move-explain/Cargo.toml b/language/tools/move-explain/Cargo.toml
index b946e3f027bb8..d0ed38bd43227 100644
--- a/language/tools/move-explain/Cargo.toml
+++ b/language/tools/move-explain/Cargo.toml
@@ -3,7 +3,7 @@ name = "move-explain"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem Move abort code explanations"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/tools/resource-viewer/Cargo.toml b/language/tools/resource-viewer/Cargo.toml
index 85dd3f8291be6..12aa4a7a5ada4 100644
--- a/language/tools/resource-viewer/Cargo.toml
+++ b/language/tools/resource-viewer/Cargo.toml
@@ -3,7 +3,7 @@ name = "resource-viewer"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem genesis viewer"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/tools/vm-genesis/Cargo.toml b/language/tools/vm-genesis/Cargo.toml
index a26846585e635..cdd7d17f07092 100644
--- a/language/tools/vm-genesis/Cargo.toml
+++ b/language/tools/vm-genesis/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem vm genesis"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/transaction-builder/Cargo.toml b/language/transaction-builder/Cargo.toml
index 6a37ad8d71c6a..2b001ca53fbfc 100644
--- a/language/transaction-builder/Cargo.toml
+++ b/language/transaction-builder/Cargo.toml
@@ -3,7 +3,7 @@ name = "transaction-builder"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem transaction-builder"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/language/transaction-builder/generator/Cargo.toml b/language/transaction-builder/generator/Cargo.toml
index 65853bf06ba34..e8def27df4672 100644
--- a/language/transaction-builder/generator/Cargo.toml
+++ b/language/transaction-builder/generator/Cargo.toml
@@ -3,7 +3,7 @@ name = "transaction-builder-generator"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem transaction-builder"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/language/transaction-builder/generator/README.md b/language/transaction-builder/generator/README.md
index 553c7d351d76d..52668ba33cf02 100644
--- a/language/transaction-builder/generator/README.md
+++ b/language/transaction-builder/generator/README.md
@@ -1,7 +1,7 @@
 ---
 id: transaction-builder-generator
 title: Transaction Builder Generator
-custom_edit_url: https://github.com/libra/libra/edit/master/language/transaction-builder-generator/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/transaction-builder-generator/README.md
 ---
 
 # Transaction Builder Generator
diff --git a/language/vm/Cargo.toml b/language/vm/Cargo.toml
index 5de6c655ccee7..bb2a00eaa5617 100644
--- a/language/vm/Cargo.toml
+++ b/language/vm/Cargo.toml
@@ -3,7 +3,7 @@ name = "vm"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem vm"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/language/vm/README.md b/language/vm/README.md
index d1ac77287a986..fe0fa923581af 100644
--- a/language/vm/README.md
+++ b/language/vm/README.md
@@ -1,7 +1,7 @@
 ---
 id: vm
 title: Virtual Machine
-custom_edit_url: https://github.com/libra/libra/edit/master/language/vm/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/language/vm/README.md
 ---
 
 
@@ -14,7 +14,7 @@ metering logical abstraction is also defined there.
 
 The MoveVM is a stack machine with a static type system. The MoveVM honors
 the specification of the Move language through a mix of file format,
-verification (for reference [bytcode verifier README](https://github.com/libra/libra/blob/master/language/bytecode-verifier/README.md))
+verification (for reference [bytcode verifier README](https://github.com/diem/diem/blob/master/language/bytecode-verifier/README.md))
 and runtime constraints. The structure of the file format allows the
 definition of modules, types (resources and unrestricted types), and
 functions. Code is expressed via bytecode instructions, which may have
@@ -40,7 +40,7 @@ The `CompiledModule` and `CompiledScript` definitions in
 `diem/language/vm/src/file_format.rs` are the top-level structs for a Move
 *Module* or *Transaction Script*, respectively. These structs provide a
 simple abstraction over the file format. Additionally, a set of
-[*Views*](https://github.com/libra/libra/blob/master/language/vm/src/views.rs) are defined to easily navigate and inspect
+[*Views*](https://github.com/diem/diem/blob/master/language/vm/src/views.rs) are defined to easily navigate and inspect
 `CompiledModule`s and `CompiledScript`s.
 
 ## Folder Structure
diff --git a/language/vm/serializer-tests/Cargo.toml b/language/vm/serializer-tests/Cargo.toml
index 77c98847423f1..b6f15ed460176 100644
--- a/language/vm/serializer-tests/Cargo.toml
+++ b/language/vm/serializer-tests/Cargo.toml
@@ -3,7 +3,7 @@ name = "serializer-tests"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem serializer tests"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/mempool/Cargo.toml b/mempool/Cargo.toml
index ca76f1a905948..7deb64d468590 100644
--- a/mempool/Cargo.toml
+++ b/mempool/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-mempool"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem mempool"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/mempool/README.md b/mempool/README.md
index fc385f10994f3..45c82d9597a51 100644
--- a/mempool/README.md
+++ b/mempool/README.md
@@ -1,7 +1,7 @@
 ---
 id: mempool
 title: Mempool
-custom_edit_url: https://github.com/libra/libra/edit/master/mempool/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/mempool/README.md
 ---
 
 Mempool is a memory-buffer that holds the transactions that are waiting to be executed.
diff --git a/network/Cargo.toml b/network/Cargo.toml
index 859ae19a60730..2a5f771b4016d 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -3,7 +3,7 @@ name = "network"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem network"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/network/README.md b/network/README.md
index ca29367992618..04b7e2efcf4ea 100644
--- a/network/README.md
+++ b/network/README.md
@@ -1,7 +1,7 @@
 ---
 id: network
 title: Network
-custom_edit_url: https://github.com/libra/libra/edit/master/network/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/network/README.md
 ---
 
 
diff --git a/network/builder/Cargo.toml b/network/builder/Cargo.toml
index 0875d644839c1..12f02fe58ab9d 100644
--- a/network/builder/Cargo.toml
+++ b/network/builder/Cargo.toml
@@ -3,7 +3,7 @@ name = "network-builder"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem Onchain Discovery Protocol"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/network/memsocket/Cargo.toml b/network/memsocket/Cargo.toml
index 124b6c0d2cd0e..0fae0cb46e298 100644
--- a/network/memsocket/Cargo.toml
+++ b/network/memsocket/Cargo.toml
@@ -3,7 +3,7 @@ name = "memsocket"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem memsocket"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/network/netcore/Cargo.toml b/network/netcore/Cargo.toml
index 232e760720139..291d2507038d6 100644
--- a/network/netcore/Cargo.toml
+++ b/network/netcore/Cargo.toml
@@ -3,7 +3,7 @@ name = "netcore"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem netcore"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/network/network-address/Cargo.toml b/network/network-address/Cargo.toml
index 818a46c257622..678e034cf5d42 100644
--- a/network/network-address/Cargo.toml
+++ b/network/network-address/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-network-address"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem types"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/network/simple-onchain-discovery/Cargo.toml b/network/simple-onchain-discovery/Cargo.toml
index 1d952144315bd..62494bf14aa35 100644
--- a/network/simple-onchain-discovery/Cargo.toml
+++ b/network/simple-onchain-discovery/Cargo.toml
@@ -3,7 +3,7 @@ name = "network-simple-onchain-discovery"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem socket bench server"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/network/socket-bench-server/Cargo.toml b/network/socket-bench-server/Cargo.toml
index 7c5c0a28944d9..21e30f8edc60e 100644
--- a/network/socket-bench-server/Cargo.toml
+++ b/network/socket-bench-server/Cargo.toml
@@ -3,7 +3,7 @@ name = "socket-bench-server"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem socket bench server"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/network/src/peer_manager/mod.rs b/network/src/peer_manager/mod.rs
index 990c6c875cf21..2a0fe02b1d2f6 100644
--- a/network/src/peer_manager/mod.rs
+++ b/network/src/peer_manager/mod.rs
@@ -482,7 +482,7 @@ where
                 }
             }
             TransportNotification::Disconnected(lost_conn_metadata, reason) => {
-                // See: https://github.com/libra/libra/issues/3128#issuecomment-605351504 for
+                // See: https://github.com/diem/diem/issues/3128#issuecomment-605351504 for
                 // detailed reasoning on `Disconnected` events should be handled correctly.
                 info!(
                     NetworkSchema::new(&self.network_context)
diff --git a/network/src/protocols/wire/messaging/v1/mod.rs b/network/src/protocols/wire/messaging/v1/mod.rs
index 0590cb1bd635b..84576a30ee7e3 100644
--- a/network/src/protocols/wire/messaging/v1/mod.rs
+++ b/network/src/protocols/wire/messaging/v1/mod.rs
@@ -5,7 +5,7 @@
 //! serialized/deserialized, and provides a `Sink` and `Stream` implementation
 //! for sending `NetworkMessage`s over an abstract IO object (presumably a socket).
 //!
-//! The [DiemNet specification](https://github.com/libra/libra/blob/master/specifications/network/messaging-v1.md)
+//! The [DiemNet specification](https://github.com/diem/diem/blob/master/specifications/network/messaging-v1.md)
 //! describes in greater detail how these messages are sent and received
 //! over-the-wire.
 
diff --git a/network/src/transport/mod.rs b/network/src/transport/mod.rs
index 2a59c983d9423..37c24172c9e2d 100644
--- a/network/src/transport/mod.rs
+++ b/network/src/transport/mod.rs
@@ -372,7 +372,7 @@ async fn upgrade_outbound<T: TSocket>(
 /// protocol). Finally, we negotiate common supported application protocols with
 /// the `Handshake` protocol.
 // TODO(philiphayes): rework Transport trait, possibly include Upgrade trait.
-// ideas in this PR thread: https://github.com/libra/libra/pull/3478#issuecomment-617385633
+// ideas in this PR thread: https://github.com/diem/diem/pull/3478#issuecomment-617385633
 pub struct DiemNetTransport<TTransport> {
     base_transport: TTransport,
     ctxt: Arc<UpgradeContext>,
diff --git a/secure/json-rpc/Cargo.toml b/secure/json-rpc/Cargo.toml
index 72b6aea67235f..4ae571d66ce7b 100644
--- a/secure/json-rpc/Cargo.toml
+++ b/secure/json-rpc/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-secure-json-rpc"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 description = "A Lightweight and Secure JSON RPC Client"
 homepage = "https://diem.com"
 license = "Apache-2.0"
diff --git a/secure/json-rpc/README.md b/secure/json-rpc/README.md
index 9c300fbc44df1..f36f4d2f38cba 100644
--- a/secure/json-rpc/README.md
+++ b/secure/json-rpc/README.md
@@ -1,7 +1,7 @@
 ---
 id: secure_json_rpc
 title: Secure JSON RPC
-custom_edit_url: https://github.com/libra/libra/edit/master/secure/json-rpc/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/secure/json-rpc/README.md
 ---
 # Secure JSON RPC
 
diff --git a/secure/key-manager/Cargo.toml b/secure/key-manager/Cargo.toml
index e16ceef7fab73..504a0e511aec9 100644
--- a/secure/key-manager/Cargo.toml
+++ b/secure/key-manager/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem Key Manager"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/secure/key-manager/README.md b/secure/key-manager/README.md
index b739c5a1f2b22..521e1395330a6 100644
--- a/secure/key-manager/README.md
+++ b/secure/key-manager/README.md
@@ -1,7 +1,7 @@
 ---
 id: key_manager
 title: Key Manager
-custom_edit_url: https://github.com/libra/libra/edit/master/secure/key-manager/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/secure/key-manager/README.md
 ---
 # Key Manager
 
diff --git a/secure/net/Cargo.toml b/secure/net/Cargo.toml
index 1f8bb2960880e..03eafe006c7b0 100644
--- a/secure/net/Cargo.toml
+++ b/secure/net/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-secure-net"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 description = "Diem's Simple Network Substrate"
 homepage = "https://diem.com"
 license = "Apache-2.0"
diff --git a/secure/push-metrics/Cargo.toml b/secure/push-metrics/Cargo.toml
index a540e11834c79..e2d88e32bb98d 100644
--- a/secure/push-metrics/Cargo.toml
+++ b/secure/push-metrics/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-secure-push-metrics"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diem-util"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/secure/storage/Cargo.toml b/secure/storage/Cargo.toml
index bb03dc75e2a67..09f15e725720d 100644
--- a/secure/storage/Cargo.toml
+++ b/secure/storage/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-secure-storage"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 description = "Diem's Persistent, Secure Storage"
 homepage = "https://diem.com"
 license = "Apache-2.0"
diff --git a/secure/storage/README.md b/secure/storage/README.md
index be407f43ac48a..ef56827d57717 100644
--- a/secure/storage/README.md
+++ b/secure/storage/README.md
@@ -1,7 +1,7 @@
 ---
 id: secure_storage
 title: Secure Storage
-custom_edit_url: https://github.com/libra/libra/edit/master/secure/storage/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/secure/storage/README.md
 ---
 # Secure Storage
 
diff --git a/secure/storage/github/Cargo.toml b/secure/storage/github/Cargo.toml
index 82281f9f252ab..559eaf1c3b563 100644
--- a/secure/storage/github/Cargo.toml
+++ b/secure/storage/github/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-github-client"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 description = "Diem's Restful GitHub Client"
 homepage = "https://diem.com"
 license = "Apache-2.0"
diff --git a/secure/storage/vault/Cargo.toml b/secure/storage/vault/Cargo.toml
index 6d38d899ed918..2f4794f538906 100644
--- a/secure/storage/vault/Cargo.toml
+++ b/secure/storage/vault/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-vault-client"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 description = "Diem's Restful Vault Client"
 homepage = "https://diem.com"
 license = "Apache-2.0"
diff --git a/secure/time/Cargo.toml b/secure/time/Cargo.toml
index f4c3455057f36..5eae5ec84db4f 100644
--- a/secure/time/Cargo.toml
+++ b/secure/time/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-secure-time"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 description = "A lightweight wrapper around time"
 homepage = "https://diem.com"
 license = "Apache-2.0"
diff --git a/specifications/README.md b/specifications/README.md
index beeaf2f6e365a..498237aa29e1b 100644
--- a/specifications/README.md
+++ b/specifications/README.md
@@ -6,7 +6,7 @@ This document describes the protocol specifications for the Diem Payment Network
 * Developers who work on supporting transaction validation and interface with the validation protocols.
 * Those interested in improving the protocol specifications and/or understanding the LPN in more detail.
 
-The reference implementations for all LPN specifications is [Diem Core](https://github.com/libra/libra). Diem Core is maintained by the open-source developer community on behalf of the [Diem Association](https://diem.com/en-US/association/). After the initial launch of the LPN, all specification changes will be proposed via the Diem Improvement Proposals (LIP) process - which is not yet finalized and public. For expedience prior to the launch of the LPN, changes to the specification will be made directly in the documentation and code.
+The reference implementations for all LPN specifications is [Diem Core](https://github.com/diem/diem). Diem Core is maintained by the open-source developer community on behalf of the [Diem Association](https://diem.com/en-US/association/). After the initial launch of the LPN, all specification changes will be proposed via the Diem Improvement Proposals (LIP) process - which is not yet finalized and public. For expedience prior to the launch of the LPN, changes to the specification will be made directly in the documentation and code.
 
 ## Overview
 
@@ -66,7 +66,7 @@ The LPN specifications are designed to support upgrades over time via the Diem I
 
 The process for upgrading the LPN specifications is as follows:
 
-1. **Seed an idea**. A Contributor should socialize their idea with the Diem developer community and Maintainers. They might create a [GitHub issue](https://github.com/libra/libra/issues) or use another means of gathering feedback.
+1. **Seed an idea**. A Contributor should socialize their idea with the Diem developer community and Maintainers. They might create a [GitHub issue](https://github.com/diem/diem/issues) or use another means of gathering feedback.
 
 2. **[Standard LIP](https://dip.diem.com/overview)**. A Contributor proposes a new standard LIP that modifies an existing specification(s) or proposes a new specification. If the standard LIP reaches the "Accepted" status, the proposed changes will be set in the new specification version as well as implemented in the Diem Core master branch. Other implementations of the protocol must follow these changes as well.
 
diff --git a/specifications/crypto/README.md b/specifications/crypto/README.md
index 896a26150dc8b..9972812246726 100644
--- a/specifications/crypto/README.md
+++ b/specifications/crypto/README.md
@@ -130,7 +130,7 @@ moment, suffice to say that for every Diem data structure, we also define
 and specify a domain separator.
 
 More specifically, the domain separator [starts with a
-prefix](https://github.com/libra/libra/blob/ca14568db9df8c7008dfc6698392ef479e013cf6/crypto/crypto/src/hash.rs#L114-L117)
+prefix](https://github.com/diem/diem/blob/ca14568db9df8c7008dfc6698392ef479e013cf6/crypto/crypto/src/hash.rs#L114-L117)
 defined as an ASCII-encoded byte-string:
 
 ```rust
@@ -147,7 +147,7 @@ Note that while the serialization name coincides with the name of the structure
 in Rust for many such types, it is overridable, and we expect such overrides to
 occur over time, at least for the purpose of versioning. Our serialization
 library includes tooling to [extract the latest serialization
-specification](https://github.com/libra/libra/tree/master/testsuite/generate-format/tests/staged),
+specification](https://github.com/diem/diem/tree/master/testsuite/generate-format/tests/staged),
 including the trace name, from code, and developers are advised to look for
 changes therein across Diem releases.
 
@@ -215,7 +215,7 @@ multi-signatures, with signer accountability. This type of signature supports K
 out-of N semantics, for K ≤ N ≤ 32.
 
 The implementation, exposed as a Move standard library module
-[(Authenticator)](https://github.com/libra/libra/blob/master/language/stdlib/modules/Authenticator.move),
+[(Authenticator)](https://github.com/diem/diem/blob/master/language/stdlib/modules/Authenticator.move),
 is currently simply a multiple-signature container —rather than a distinct
 signing scheme (e.g. MuSig). Nonetheless, we plan to improve it in further
 LIPs, while expanding the scope of threshold signing.
diff --git a/specifications/state_sync/README.md b/specifications/state_sync/README.md
index 76581a832a306..0cc6680763863 100644
--- a/specifications/state_sync/README.md
+++ b/specifications/state_sync/README.md
@@ -44,7 +44,7 @@ they rely only on the state synchronizer to discover and sync to a more recent
 ledger state.
 
 3. [Waypoint sync](#waypoint-sync): When a node starts up, it can specify a waypoint
-to sync its local state to - see section 3.4 in [this paper](https://github.com/libra/libra/blob/master/documentation/tech-papers/lbft-verification/lbft-verification.pdf) for more context and
+to sync its local state to - see section 3.4 in [this paper](https://github.com/diem/diem/blob/master/documentation/tech-papers/lbft-verification/lbft-verification.pdf) for more context and
 motivation for waypoint sync, as this specification primarily focuses on
 the technical requirements for the waypoint sync protocol. Waypoint sync
 happens at node initialization and must be completed before the node participates
@@ -280,7 +280,7 @@ fn send_to(recipient: PeerId, message: StateSynchronizerMsg)
 
 ### Consensus
 
-State synchronizer processes consensus's  [`StateComputer::sync_to` calls](https://github.com/libra/libra/tree/master/specifications/consensus#statecomputer)
+State synchronizer processes consensus's  [`StateComputer::sync_to` calls](https://github.com/diem/diem/tree/master/specifications/consensus#statecomputer)
 by going through the [validator sync protocol](#validator-sync), and notifies
 consensus once the ledger state has reached the version in the ledger info
 in consensus' request.
@@ -295,7 +295,7 @@ Implementing and coordinating this interaction is an implementation detail.
 
 ### Execution
 
-State synchronizer uses execution's [`ChunkExecutor` interface](https://github.com/libra/libra/tree/master/specifications/trusted_computing_base/execution_correctness#executor-interface)
+State synchronizer uses execution's [`ChunkExecutor` interface](https://github.com/diem/diem/tree/master/specifications/trusted_computing_base/execution_correctness#executor-interface)
 to execute and store transactions to storage
 
 ### Storage
diff --git a/specifications/trusted_computing_base/key_manager/README.md b/specifications/trusted_computing_base/key_manager/README.md
index 703e3b8d93037..d9dc133f7513c 100644
--- a/specifications/trusted_computing_base/key_manager/README.md
+++ b/specifications/trusted_computing_base/key_manager/README.md
@@ -11,7 +11,7 @@ This specification outlines the design and execution of the Key Manager (KM): th
 
 ## Overview
 
-Validator nodes (VNs) and validator full nodes (VFNs) generate and store cryptographic keys in order to securely participate in the Diem network. For example, each VN in Diem maintains a secret and unique cryptographic key that can be used to sign votes on quorum certificates; this allows VNs to achieve [consensus](https://github.com/libra/libra/tree/master/specifications/consensus) on transactions within Diem. Likewise, all VNs and VFNs in the network maintain cryptographic keys to authenticate and encrypt communication between nodes; thus, preventing adversaries from interfering with network communication in order to perform attacks.
+Validator nodes (VNs) and validator full nodes (VFNs) generate and store cryptographic keys in order to securely participate in the Diem network. For example, each VN in Diem maintains a secret and unique cryptographic key that can be used to sign votes on quorum certificates; this allows VNs to achieve [consensus](https://github.com/diem/diem/tree/master/specifications/consensus) on transactions within Diem. Likewise, all VNs and VFNs in the network maintain cryptographic keys to authenticate and encrypt communication between nodes; thus, preventing adversaries from interfering with network communication in order to perform attacks.
 
 To maintain the integrity and confidentiality of cryptographic keys in the Diem network, the KM is responsible for automatically rotating these keys over time. This provides freshness for keys used by the VNs and VFNs mitigating long range attacks, where keys are compromised and gathered over long periods of time.
 
@@ -31,10 +31,10 @@ At a high-level, the KM is designed to be a stand-alone service that drives the
 
 **Key Manager Architecture**: First, there are several important components that must be highlighted within the architecture diagram above; these are displayed in color:
 
-* **Secure Storage**: First, Secure Storage (SS) is the storage backend used by the KM to persist and hold cryptographic keys. The KM relies on SS as a single source of truth regarding the value of any cryptographic key for the VN/VFN. For more information about the SS, see the specification, [here](https://github.com/libra/libra/tree/master/specifications/trusted_computing_base/secure_storage).
+* **Secure Storage**: First, Secure Storage (SS) is the storage backend used by the KM to persist and hold cryptographic keys. The KM relies on SS as a single source of truth regarding the value of any cryptographic key for the VN/VFN. For more information about the SS, see the specification, [here](https://github.com/diem/diem/tree/master/specifications/trusted_computing_base/secure_storage).
 * **Validator Configs**: Second, the mapping between VNs/VFNs to cryptographic keys is stored on the Diem blockchain in a `Validator Config` resource held under each validator operator's account. For example, in the case of the consensus key, each VN will register their consensus key in the validator config of that node, on-chain. The consensus key for that VN can then be seen by all other VNs in the network, and thus used to authenticate the consensus votes signed by the consensus key. To protect the validator config of each VN/VFN, each VN/VFN is assumed to have a unique and private identity key, called the _operator key_ that has permission to update the validator config for that VN. The _operator key_ is initialized and held in the SS for each VN and VFN. More details on validator configs and the _operator key_  is presented below.
 * **JSON RPC Endpoint**: Third, in order to interact with state on the Diem blockchain (e.g., update each validator config), the KM requires the ability to read and write transactions to the blockchain. To achieve this, a JSON RPC endpoint is assumed to be online and available to handle KM requests.
-* **Components with Exported Keys**: Fourth, and finally, each VN may have multiple components that maintain direct copies or exports of cryptographic private keys. It is important to note these components explicitly, as they not only affect how the KM supports key rotations, but they also have significant security implications. For example, in the diagram above, we can see the Diem Safety Rules (LSR) component. LSR is a component within each VN responsible for participating in consensus (see [here](https://github.com/libra/libra/tree/master/specifications/trusted_computing_base/safety_rules)). For performance reasons, LSR maintains its own local copy of the consensus private key, which we term an _exported key copy_. We highlight components that maintain exported key copies and discuss the implications of key copies to the KM's role in further detail below.
+* **Components with Exported Keys**: Fourth, and finally, each VN may have multiple components that maintain direct copies or exports of cryptographic private keys. It is important to note these components explicitly, as they not only affect how the KM supports key rotations, but they also have significant security implications. For example, in the diagram above, we can see the Diem Safety Rules (LSR) component. LSR is a component within each VN responsible for participating in consensus (see [here](https://github.com/diem/diem/tree/master/specifications/trusted_computing_base/safety_rules)). For performance reasons, LSR maintains its own local copy of the consensus private key, which we term an _exported key copy_. We highlight components that maintain exported key copies and discuss the implications of key copies to the KM's role in further detail below.
 
 ### Consensus Key Rotation Protocol
 
@@ -48,7 +48,7 @@ Given the KM architecture presented above, we now describe the high-level flow o
 4. The KM will take the new consensus public key returned by the SS, **consensus_public<sup>{i+1}</sup>** and generate a _rotation transaction_ that updates the on-chain validator config with the new consensus public key for the VN using the operator public key (i.e., sets **consensus_public<sup>{i}</sup>** to **consensus_public<sup>{i+1}</sup>** for the validator config of the VN). The KM will then forward the new rotation transaction to the SS to be signed.
 5. The SS will sign the rotation transaction using **operator_private** internally and return the _signed rotation transaction_ to the KM.
 6. The KM will take the signed rotation transaction and forward it to the Diem blockchain via the JSON RPC endpoint (i.e., the endpoint by which the KM can read and write transactions to the blockchain).
-7. At some later point in time, the signed rotation transaction is committed to the blockchain, meaning that when the next consensus reconfiguration event occurs (i.e., the next set of VNs is to selected to perform consensus, see [here](https://github.com/libra/libra/tree/master/specifications/consensus)), the consensus key for the VN will be updated to **consensus_public<sup>{i+1}</sup>**.
+7. At some later point in time, the signed rotation transaction is committed to the blockchain, meaning that when the next consensus reconfiguration event occurs (i.e., the next set of VNs is to selected to perform consensus, see [here](https://github.com/diem/diem/tree/master/specifications/consensus)), the consensus key for the VN will be updated to **consensus_public<sup>{i+1}</sup>**.
 8. Once all 6 steps above have been completed, the consensus key for the VN has successfully been rotated both inside the SS, and on the blockchain. However, due to performance reasons, it's possible that other components within the VN may have previously exported the consensus private key and thus hold temporary copies of the old key locally. For example, LSR is one such component: to improve the throughput and latency of the consensus algorithm, LSR exports the consensus private key upon initialization, and maintains a copy of the private key in local memory. This avoids having to contact the SS whenever it wishes to sign a quorum certificate. In order to prevent this key from becoming stale, LSR monitors the blockchain for reconfiguration events, and after each reconfiguration event, LSR will verify if the consensus key for this VN has been rotated. If so, LSR will query the SS directly to export the consensus private key corresponding to the consensus public key registered in the validator config on-chain (i.e., fetch **consensus_private<sup>{i+1}</sup>** for **consensus_public<sup>{i+1}</sup>**).
 9. Upon a key export request, the SS will verify the requester has appropriate permissions to retrieve the requested key, and if so, return the key as required. In this case, it will return **consensus_private<sup>{i+1}</sup>** to LSR. This concludes the consensus key rotation.
 
@@ -72,7 +72,7 @@ At any point during a consensus key rotation, it is possible for any component w
 In this section, we discuss in further detail the external components relied upon by the KM. These are: the secure storage (SS), the validator configs, and the JSON RPC endpoint. For each of these components, we present abstractions (e.g., component interfaces) in order to reason about the correctness of the KM protocols. Assuming each of these external components is implemented correctly (i.e., according to the interfaces they expose), we argue for the security and correctness of the KM.
 
 ### Secure Storage (SS)
-The SS offers a secure persistent backend for generating, storing and managing security-critical data. While this includes a wide variety of data types (e.g., arbitrary text, json blobs, waypoints etc.), the KM only requires cryptographic key support from the SS. As such, we focus on this support here. For further information about the SS, see the specification [here](https://github.com/libra/libra/tree/master/specifications/trusted_computing_base/secure_storage).
+The SS offers a secure persistent backend for generating, storing and managing security-critical data. While this includes a wide variety of data types (e.g., arbitrary text, json blobs, waypoints etc.), the KM only requires cryptographic key support from the SS. As such, we focus on this support here. For further information about the SS, see the specification [here](https://github.com/diem/diem/tree/master/specifications/trusted_computing_base/secure_storage).
 
 At a high-level, the KM requires several important functionalities from the SS. We list these functionalities below, and for each functionality, explain what it is required, and where it is used.
 
@@ -81,7 +81,7 @@ At a high-level, the KM requires several important functionalities from the SS.
 - **Key Versioning**: Third, the KM requires the SS to be able to store and maintain multiple versions (e.g., **N=2**) of each private key locally. This is needed to recover from specific failure scenarios, e.g., LSR requiring a previous version of the consensus key after a failure. See the [consensus key rotation failures](#consensus-key-rotation-failures) section above.
 - **Private Key Export**: Fourth, the KM requires the SS to allow the exporting of private keys outside the domain of the SS. This is so that specific components within each VN can maintain *hot copies* of specific keys. For example, LSR requires a local hot copy of the consensus key for performance reasons (see the section above).
 
-To support all of the required functionalities listed above for the KM, the SS provides a complete cryptographic key API named `CryptoStorage`. The snippet below shows a simplified `CryptoStorage` API. To view the full API, see the SS specification [here](https://github.com/libra/libra/tree/master/specifications/trusted_computing_base/secure_storage).
+To support all of the required functionalities listed above for the KM, the SS provides a complete cryptographic key API named `CryptoStorage`. The snippet below shows a simplified `CryptoStorage` API. To view the full API, see the SS specification [here](https://github.com/diem/diem/tree/master/specifications/trusted_computing_base/secure_storage).
 
 ```rust
 // CryptoStorage offers a secure storage engine for generating, using and managing cryptographic
@@ -250,4 +250,4 @@ In this section, we discuss several interesting security considerations that aff
 
 * **Verifying vs. Non-verifying the JSON RPC Endpoint**: As discussed above, in order for the KM to perform key rotations, it must be able to read and write transactions to the blockchain. The KM does this internally by interfacing with a JSON RPC endpoint. However, one notable challenge arises when performing such interaction: how does the KM know the information it is being supplied by the endpoint is correct and up-to-date? If an attacker can compromise the JSON RPC endpoint, it may feed the KM stale information or incorrect blockchain state (e.g., transactions). As a result, this could cause a liveness violation for the VN node (e.g., the KM could fail to see that the VN does not have the correct consensus key registered on the blockchain, and thus will be unable to participate in consensus). To defend against this, it is critical that the KM verifies all information returned via the JSON RPC endpoint (e.g., the KM should verify proofs of account state and ensure that the height of the blockchain is monotonically increasing). This will help to reduce the attack surface against the KM. Note, however, that while the KM can verify the blockchain is growing sequentially, it is unable to verify that the information being presented to it is fresh (i.e., that the responses returned by the JSON RPC endpoint hold the most up-to-date information). As such, without querying and aggregating the responses of multiple different JSON RPC endpoints, there are always some levels of implicit trust between the KM and the endpoint it relies on.
 
-* **Minimizing the size of the KM and the corresponding TCB**: At present, the KM communicates with the JSON RPC endpoint via a JSON RPC client that verifies API responses. To achieve this, the KM implementation handles and parses both HTTP and JSON responses internally. From a security perspective, however, this is less-than-ideal. The KM forms part of the trusted computing base (TCB) of each VN (read more about the TCB, [here](https://github.com/libra/libra/tree/master/specifications/trusted_computing_base)). As a result, any and all code placed into the KM must be free from software bugs and vulnerabilities. It is critical, therefore, to reduce the amount of code placed into the KM, as this in turn reduces the attack surface of the KM and thus the TCB. We therefore argue that it is more appropriate for the KM to delegate communication with the JSON RPC endpoint to another external component, and only handle the structured API responses and proofs directly. This will prevent the KM from having to perform complex and unnecessary operations locally (e.g., parsing JSON, serialization/deserializing objects). This reduces the size of the TCB and makes the implementation easier to reason about/verify.
+* **Minimizing the size of the KM and the corresponding TCB**: At present, the KM communicates with the JSON RPC endpoint via a JSON RPC client that verifies API responses. To achieve this, the KM implementation handles and parses both HTTP and JSON responses internally. From a security perspective, however, this is less-than-ideal. The KM forms part of the trusted computing base (TCB) of each VN (read more about the TCB, [here](https://github.com/diem/diem/tree/master/specifications/trusted_computing_base)). As a result, any and all code placed into the KM must be free from software bugs and vulnerabilities. It is critical, therefore, to reduce the amount of code placed into the KM, as this in turn reduces the attack surface of the KM and thus the TCB. We therefore argue that it is more appropriate for the KM to delegate communication with the JSON RPC endpoint to another external component, and only handle the structured API responses and proofs directly. This will prevent the KM from having to perform complex and unnecessary operations locally (e.g., parsing JSON, serialization/deserializing objects). This reduces the size of the TCB and makes the implementation easier to reason about/verify.
diff --git a/state-synchronizer/Cargo.toml b/state-synchronizer/Cargo.toml
index c5e01e870a9e2..4739f7d220da2 100644
--- a/state-synchronizer/Cargo.toml
+++ b/state-synchronizer/Cargo.toml
@@ -3,7 +3,7 @@ name = "state-synchronizer"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem state synchronizer"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/state-synchronizer/README.md b/state-synchronizer/README.md
index 4122ff980b4e4..e08840b3b73af 100644
--- a/state-synchronizer/README.md
+++ b/state-synchronizer/README.md
@@ -1,7 +1,7 @@
 ---
 id: state_sync
 title: State Synchronizer
-custom_edit_url: https://github.com/libra/libra/edit/master/state-synchronizer/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/state-synchronizer/README.md
 ---
 # State Synchronizer
 
diff --git a/state-synchronizer/src/tests/integration_tests.rs b/state-synchronizer/src/tests/integration_tests.rs
index d9366f2cacdb3..3ee502c2d3825 100644
--- a/state-synchronizer/src/tests/integration_tests.rs
+++ b/state-synchronizer/src/tests/integration_tests.rs
@@ -937,7 +937,7 @@ fn test_sync_pending_ledger_infos() {
 }
 
 #[test]
-#[ignore] // TODO: https://github.com/libra/libra/issues/5771
+#[ignore] // TODO: https://github.com/diem/diem/issues/5771
 fn test_fn_failover() {
     let mut env = SynchronizerEnv::new(5);
     env.start_next_synchronizer(
diff --git a/storage/README.md b/storage/README.md
index 9e362a3ce215f..120dd95c005bf 100644
--- a/storage/README.md
+++ b/storage/README.md
@@ -1,7 +1,7 @@
 ---
 id: storage
 title: Storage
-custom_edit_url: https://github.com/libra/libra/edit/master/storage/README.md
+custom_edit_url: https://github.com/diem/diem/edit/master/storage/README.md
 ---
 
 
diff --git a/storage/accumulator/Cargo.toml b/storage/accumulator/Cargo.toml
index 5ab495461c7d2..a1538cfc24469 100644
--- a/storage/accumulator/Cargo.toml
+++ b/storage/accumulator/Cargo.toml
@@ -3,7 +3,7 @@ name = "accumulator"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem accumulator"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/backup/backup-cli/Cargo.toml b/storage/backup/backup-cli/Cargo.toml
index c2e27b5666230..7dc4bb19a9c8a 100644
--- a/storage/backup/backup-cli/Cargo.toml
+++ b/storage/backup/backup-cli/Cargo.toml
@@ -2,7 +2,7 @@
 name = "backup-cli"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/backup/backup-service/Cargo.toml b/storage/backup/backup-service/Cargo.toml
index a5285fe4bba8d..4bd2276b94d4f 100644
--- a/storage/backup/backup-service/Cargo.toml
+++ b/storage/backup/backup-service/Cargo.toml
@@ -2,7 +2,7 @@
 name = "backup-service"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/diemdb/Cargo.toml b/storage/diemdb/Cargo.toml
index 1b83cd767bde2..98443ada939e2 100644
--- a/storage/diemdb/Cargo.toml
+++ b/storage/diemdb/Cargo.toml
@@ -3,7 +3,7 @@ name = "diemdb"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diemdb"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/diemsum/Cargo.toml b/storage/diemsum/Cargo.toml
index 01e34b08f16b6..edfb057311d2d 100644
--- a/storage/diemsum/Cargo.toml
+++ b/storage/diemsum/Cargo.toml
@@ -3,7 +3,7 @@ name = "diemsum"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem diemdb data access tool for data analysis or human read"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/inspector/Cargo.toml b/storage/inspector/Cargo.toml
index 4fa17cac0b73e..aad6319876d1a 100644
--- a/storage/inspector/Cargo.toml
+++ b/storage/inspector/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-storage-inspector"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/jellyfish-merkle/Cargo.toml b/storage/jellyfish-merkle/Cargo.toml
index c9074ed2d811d..9fc506fe03897 100644
--- a/storage/jellyfish-merkle/Cargo.toml
+++ b/storage/jellyfish-merkle/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-jellyfish-merkle"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem jellyfish merkle"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/schemadb/Cargo.toml b/storage/schemadb/Cargo.toml
index fef425ef90b94..30b98d3f70bc8 100644
--- a/storage/schemadb/Cargo.toml
+++ b/storage/schemadb/Cargo.toml
@@ -3,7 +3,7 @@ name = "schemadb"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem schemadb"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/scratchpad/Cargo.toml b/storage/scratchpad/Cargo.toml
index 7a5b375fe4cb5..731caf36a3613 100644
--- a/storage/scratchpad/Cargo.toml
+++ b/storage/scratchpad/Cargo.toml
@@ -3,7 +3,7 @@ name = "scratchpad"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem scratchpad"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/state-view/Cargo.toml b/storage/state-view/Cargo.toml
index c4cbaaa4e4c77..7bdd8ea48df4e 100644
--- a/storage/state-view/Cargo.toml
+++ b/storage/state-view/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-state-view"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem state view"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/storage-client/Cargo.toml b/storage/storage-client/Cargo.toml
index b2335a76645a0..c60a9d76d669a 100644
--- a/storage/storage-client/Cargo.toml
+++ b/storage/storage-client/Cargo.toml
@@ -3,7 +3,7 @@ name = "storage-client"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem storage client"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/storage-interface/Cargo.toml b/storage/storage-interface/Cargo.toml
index 8d9663abf7bbb..3d50b02ab1f79 100644
--- a/storage/storage-interface/Cargo.toml
+++ b/storage/storage-interface/Cargo.toml
@@ -3,7 +3,7 @@ name = "storage-interface"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem storage interface"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/storage/storage-service/Cargo.toml b/storage/storage-service/Cargo.toml
index 4386915774933..fcae882c7cc9e 100644
--- a/storage/storage-service/Cargo.toml
+++ b/storage/storage-service/Cargo.toml
@@ -3,7 +3,7 @@ name = "storage-service"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem storage service"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/testsuite/cli/Cargo.toml b/testsuite/cli/Cargo.toml
index c2bfa3d818662..0bff53d8663a0 100644
--- a/testsuite/cli/Cargo.toml
+++ b/testsuite/cli/Cargo.toml
@@ -3,7 +3,7 @@ name = "cli"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem client"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/testsuite/cli/diem-wallet/Cargo.toml b/testsuite/cli/diem-wallet/Cargo.toml
index d707a5310d82d..ef98b414aefa8 100644
--- a/testsuite/cli/diem-wallet/Cargo.toml
+++ b/testsuite/cli/diem-wallet/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-wallet"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem wallet"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/testsuite/cluster-test/Cargo.toml b/testsuite/cluster-test/Cargo.toml
index 9323f8cccbc06..565984988637a 100644
--- a/testsuite/cluster-test/Cargo.toml
+++ b/testsuite/cluster-test/Cargo.toml
@@ -3,7 +3,7 @@ name = "cluster-test"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem cluster test"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/testsuite/diem-fuzzer/Cargo.toml b/testsuite/diem-fuzzer/Cargo.toml
index 6b775a6a0b215..b12a9491c8d16 100644
--- a/testsuite/diem-fuzzer/Cargo.toml
+++ b/testsuite/diem-fuzzer/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-fuzzer"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem fuzzer"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 edition = "2018"
diff --git a/testsuite/diem-fuzzer/fuzz/Cargo.toml b/testsuite/diem-fuzzer/fuzz/Cargo.toml
index db08dd15d9f7e..6d55758099173 100644
--- a/testsuite/diem-fuzzer/fuzz/Cargo.toml
+++ b/testsuite/diem-fuzzer/fuzz/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2018"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem fuzzer fuzz"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/testsuite/diem-swarm/Cargo.toml b/testsuite/diem-swarm/Cargo.toml
index ccd3c1c355755..3328fbac6087f 100644
--- a/testsuite/diem-swarm/Cargo.toml
+++ b/testsuite/diem-swarm/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-swarm"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem swarm"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/testsuite/generate-format/Cargo.toml b/testsuite/generate-format/Cargo.toml
index 0b95a07d5f65d..f884a029186fc 100644
--- a/testsuite/generate-format/Cargo.toml
+++ b/testsuite/generate-format/Cargo.toml
@@ -3,7 +3,7 @@ name = "generate-format"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem types"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml
index 4c12ee2b09419..62d36561d8b34 100644
--- a/testsuite/smoke-test/Cargo.toml
+++ b/testsuite/smoke-test/Cargo.toml
@@ -3,7 +3,7 @@ name = "smoke-test"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem smoke test"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/testsuite/smoke-test/attribute/Cargo.toml b/testsuite/smoke-test/attribute/Cargo.toml
index b3660708c543b..88dbd693c305b 100644
--- a/testsuite/smoke-test/attribute/Cargo.toml
+++ b/testsuite/smoke-test/attribute/Cargo.toml
@@ -2,7 +2,7 @@
 name = "diem-smoke-test-attribute"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/types/Cargo.toml b/types/Cargo.toml
index b762a98593c63..bcc6f81a43838 100644
--- a/types/Cargo.toml
+++ b/types/Cargo.toml
@@ -3,7 +3,7 @@ name = "diem-types"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem types"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false
diff --git a/vm-validator/Cargo.toml b/vm-validator/Cargo.toml
index be0d50370d0ec..ab3d037e296e9 100644
--- a/vm-validator/Cargo.toml
+++ b/vm-validator/Cargo.toml
@@ -3,7 +3,7 @@ name = "vm-validator"
 version = "0.1.0"
 authors = ["Diem Association <opensource@diem.com>"]
 description = "Diem vm validator"
-repository = "https://github.com/libra/libra"
+repository = "https://github.com/diem/diem"
 homepage = "https://diem.com"
 license = "Apache-2.0"
 publish = false