diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ebaa5697e3..492158593e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,16 +29,16 @@ First things first, please review the [Hyperledger Code of Conduct](https://wiki
 There are many ways to contribute to Hyperledger Cacti, both as a user and as a developer.
 
 As a user, this can include:
-* [Making Feature/Enhancement Proposals](https://github.com/hyperledger/cacti/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)
-* [Reporting bugs](https://github.com/hyperledger/cacti/issues/new?assignees=&labels=bug&template=bug_report.md&title=)
+* [Making Feature/Enhancement Proposals](https://github.com/hyperledger-cacti/cacti/issues/new?assignees=&labels=enhancement&template=feature_request.md&title=)
+* [Reporting bugs](https://github.com/hyperledger-cacti/cacti/issues/new?assignees=&labels=bug&template=bug_report.md&title=)
 
 As a developer:
-* if you only have a little time, consider picking up a [“help-wanted”](https://github.com/hyperledger/cacti/labels/help%20wanted) or ["good-first-issue"](https://github.com/hyperledger/cacti/labels/good%20first%20issue) task
+* if you only have a little time, consider picking up a [“help-wanted”](https://github.com/hyperledger-cacti/cacti/labels/help%20wanted) or ["good-first-issue"](https://github.com/hyperledger-cacti/cacti/labels/good%20first%20issue) task
 * If you can commit to full-time development, then please contact us on our [Discord channel](https://discord.com/channels/905194001349627914/908379338716631050) to work through logistics!
 
 We welcome contributions to this project in many forms, whether it is to fix a bug, improve the documentation, add a new feature, or add support for any new DLT platform.
 
-Please familiarize yourself with the [documentation](https://hyperledger.github.io/cacti/). In particular, review the [vision and design methodology](https://hyperledger.github.io/cacti/vision/) and [system architecture](https://hyperledger.github.io/cacti/architecture/). Follow the tutorial instructions to test the [Cactus](https://hyperledger.github.io/cacti/cactus/introduction/) and [Weaver](https://hyperledger.github.io/cacti/weaver/introduction/) features respectively. (For a deeper understanding of the Weaver design and specifications, also check out the [Weaver RFCs](https://github.com/hyperledger/cacti/tree/main/weaver/rfcs).)
+Please familiarize yourself with the [documentation](https://hyperledger-cacti.github.io/cacti/). In particular, review the [vision and design methodology](https://hyperledger-cacti.github.io/cacti/vision/) and [system architecture](https://hyperledger-cacti.github.io/cacti/architecture/). Follow the tutorial instructions to test the [Cactus](https://hyperledger-cacti.github.io/cacti/cactus/introduction/) and [Weaver](https://hyperledger-cacti.github.io/cacti/weaver/introduction/) features respectively. (For a deeper understanding of the Weaver design and specifications, also check out the [Weaver RFCs](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/rfcs).)
 
 ## Git Know How / Reading List
 
diff --git a/README-cactus.md b/README-cactus.md
index c798249b65..df105c25f1 100644
--- a/README-cactus.md
+++ b/README-cactus.md
@@ -53,7 +53,7 @@ Once the last command has finished executing, open link printed on the console w
 ## Documentation
 
 * [Project Wiki](https://wiki.hyperledger.org/display/cactus): Schedule and logs of the maintainer meetings
-* [Understanding and Using](https://hyperledger.github.io/cacti/cactus/introduction/): Description of components and instructions for usage and testing
+* [Understanding and Using](https://hyperledger-cacti.github.io/cacti/cactus/introduction/): Description of components and instructions for usage and testing
 * [Whitepaper](./whitepaper/whitepaper.md): The official document on Cactus design specifications (_Note_: this is deprecated. We are working on a new version.)
 * [Contributing](./CONTRIBUTING.md): How to get from an idea to an approved pull request
 * [Build](./BUILD.md): Instructions on how to set up the project for development
diff --git a/README.md b/README.md
index 403a3d9caa..450a125857 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ The current Cacti code base contains the legacy Cactus and Weaver source code in
 
 ## Documentation
 
-See the official [Hyperledger Cacti documentation](https://hyperledger.github.io/cacti/) to get all your questions answered about the project, to get started with setup, testing, and evaluation, and to get hands-on with code and configurations. Here, you can find separate (and specific) instructions for getting started with running and experimenting with [Cactus modules](https://hyperledger.github.io/cacti/cactus/introduction/) and [Weaver modules](https://hyperledger.github.io/cacti/weaver/introduction/) respectively.
+See the official [Hyperledger Cacti documentation](https://hyperledger-cacti.github.io/cacti/) to get all your questions answered about the project, to get started with setup, testing, and evaluation, and to get hands-on with code and configurations. Here, you can find separate (and specific) instructions for getting started with running and experimenting with [Cactus modules](https://hyperledger-cacti.github.io/cacti/cactus/introduction/) and [Weaver modules](https://hyperledger-cacti.github.io/cacti/weaver/introduction/) respectively.
 
 ## Roadmap
 
diff --git a/RELEASE_MANAGEMENT.md b/RELEASE_MANAGEMENT.md
index 58d7f48fd9..c98a09822c 100644
--- a/RELEASE_MANAGEMENT.md
+++ b/RELEASE_MANAGEMENT.md
@@ -40,7 +40,7 @@ yarn build:dev
 
 - Do note the `.` as the last parameter in last two commands.
 
-- The `./tools/weaver-update-version.sh` automation script seems slightly buggy at the moment so you'll have to manually update `./weaver/core/relay/Cargo.toml` yourself. See this comment for an example: https://github.com/hyperledger/cacti/pull/3427#discussion_r1686850372
+- The `./tools/weaver-update-version.sh` automation script seems slightly buggy at the moment so you'll have to manually update `./weaver/core/relay/Cargo.toml` yourself. See this comment for an example: https://github.com/hyperledger-cacti/cacti/pull/3427#discussion_r1686850372
 
 - Double check that all of the package dependencies were updated from the previous
 version to the new one because lerna usually fails to do that for `devDependency` parts
diff --git a/docs/docs/cactus/ledger-browser/developer-guide/overview.md b/docs/docs/cactus/ledger-browser/developer-guide/overview.md
index 9c723ae4da..2372596359 100644
--- a/docs/docs/cactus/ledger-browser/developer-guide/overview.md
+++ b/docs/docs/cactus/ledger-browser/developer-guide/overview.md
@@ -9,10 +9,10 @@ Currently, applications must be included in the ledger-browser source code and b
 ## Guidelines
 
 - Use React functional components.
-- Use TypeScript and adhere to the [global Cacti linter requirements](https://github.com/hyperledger/cacti/blob/main/.eslintrc.js).
-- Whenever possible, utilize [MaterialUI](https://mui.com/) and [common UI components](https://github.com/hyperledger/cacti/tree/main/packages/cacti-ledger-browser/src/main/typescript/components/ui).
-- Use [PageTitle](https://github.com/hyperledger/cacti/tree/main/packages/cacti-ledger-browser/src/main/typescript/components/ui/PageTitle.tsx) as main page title.
-- Use [PageTitleWithGoBack](https://github.com/hyperledger/cacti/tree/main/packages/cacti-ledger-browser/src/main/typescript/components/ui/PageTitleWithGoBack.tsx) as subpage title (it has arrow attached for going back).
-- Use [NotificationContext](https://github.com/hyperledger/cacti/blob/main/packages/cacti-ledger-browser/src/main/typescript/common/context/NotificationContext.tsx) for displaying Pop-Up windows with notifications (info, success, error, etc..).
+- Use TypeScript and adhere to the [global Cacti linter requirements](https://github.com/hyperledger-cacti/cacti/blob/main/.eslintrc.js).
+- Whenever possible, utilize [MaterialUI](https://mui.com/) and [common UI components](https://github.com/hyperledger-cacti/cacti/tree/main/packages/cacti-ledger-browser/src/main/typescript/components/ui).
+- Use [PageTitle](https://github.com/hyperledger-cacti/cacti/tree/main/packages/cacti-ledger-browser/src/main/typescript/components/ui/PageTitle.tsx) as main page title.
+- Use [PageTitleWithGoBack](https://github.com/hyperledger-cacti/cacti/tree/main/packages/cacti-ledger-browser/src/main/typescript/components/ui/PageTitleWithGoBack.tsx) as subpage title (it has arrow attached for going back).
+- Use [NotificationContext](https://github.com/hyperledger-cacti/cacti/blob/main/packages/cacti-ledger-browser/src/main/typescript/common/context/NotificationContext.tsx) for displaying Pop-Up windows with notifications (info, success, error, etc..).
 - App routes are defined using [react-router-dom](https://reactrouter.com/en/main).
 - Use [react-query](https://tanstack.com/query/v3) for fetching data, `QueryClientProvider` is already available in the application.
diff --git a/docs/docs/cactus/ledger-browser/plugin-apps/app-patterns.md b/docs/docs/cactus/ledger-browser/plugin-apps/app-patterns.md
index 07d66af784..442982350d 100644
--- a/docs/docs/cactus/ledger-browser/plugin-apps/app-patterns.md
+++ b/docs/docs/cactus/ledger-browser/plugin-apps/app-patterns.md
@@ -4,7 +4,7 @@ This page presents different patterns that some plugin applications follow. Whil
 
 ## Browser App / Persistence Plugin Apps
 
-These applications rely heavily on the existence of Cacti persistence plugins, such as [cactus-plugin-persistence-ethereum](https://github.com/hyperledger/cacti/tree/main/packages/cactus-plugin-persistence-ethereum) or [cactus-plugin-persistence-fabric](https://github.com/hyperledger/cacti/tree/main/packages/cactus-plugin-persistence-fabric).
+These applications rely heavily on the existence of Cacti persistence plugins, such as [cactus-plugin-persistence-ethereum](https://github.com/hyperledger-cacti/cacti/tree/main/packages/cactus-plugin-persistence-ethereum) or [cactus-plugin-persistence-fabric](https://github.com/hyperledger-cacti/cacti/tree/main/packages/cactus-plugin-persistence-fabric).
 
 As the name suggests, persistence plugins store the ledger state in an SQL database (e.g., PostgreSQL managed by Supabase). They synchronize all blocks, transactions, token operations, etc., into the database for later use and push new data as it arrives.
 
diff --git a/docs/docs/cactus/ledger-browser/plugin-apps/ethereum-browser.md b/docs/docs/cactus/ledger-browser/plugin-apps/ethereum-browser.md
index da6cf761f6..6aa3e6dac3 100644
--- a/docs/docs/cactus/ledger-browser/plugin-apps/ethereum-browser.md
+++ b/docs/docs/cactus/ledger-browser/plugin-apps/ethereum-browser.md
@@ -22,13 +22,13 @@ Additionally, you'll need a `PostgreSQL connection string` to start the persiste
 
 ##### Expose custom schema
 
-Fabric data is stored in a custom schema named `ethereum`. To access this data from our GUI application, you need to ensure the schema is exposed. If you're using our [supabase-all-in-one](https://github.com/hyperledger/cacti/tree/main/tools/docker/supabase-all-in-one) image, all application schemas, including `ethereum`, are already exposed, so you can skip this step. However, if you're using Supabase Cloud, you'll need to go to the [API settings](https://supabase.com/dashboard/project/_/settings/api) and add `ethereum` to the `Exposed schemas` list.
+Fabric data is stored in a custom schema named `ethereum`. To access this data from our GUI application, you need to ensure the schema is exposed. If you're using our [supabase-all-in-one](https://github.com/hyperledger-cacti/cacti/tree/main/tools/docker/supabase-all-in-one) image, all application schemas, including `ethereum`, are already exposed, so you can skip this step. However, if you're using Supabase Cloud, you'll need to go to the [API settings](https://supabase.com/dashboard/project/_/settings/api) and add `ethereum` to the `Exposed schemas` list.
 
 For more details, refer to [the full guide on custom schemas](https://supabase.com/docs/guides/api/using-custom-schemas) (note that the necessary SQL code has already been executed during the persistence plugin schema setup).
 
 #### Ethereum Ledger (Optional)
 
-This step is optional as you can use any running Ethereum ledger. However, for testing purposes, you may use our [geth-all-in-one](https://github.com/hyperledger/cacti/tree/main/tools/docker/geth-all-in-one). To start it, execute the following commands from the root of your project:
+This step is optional as you can use any running Ethereum ledger. However, for testing purposes, you may use our [geth-all-in-one](https://github.com/hyperledger-cacti/cacti/tree/main/tools/docker/geth-all-in-one). To start it, execute the following commands from the root of your project:
 
 ```shell
 # Build
@@ -40,7 +40,7 @@ docker run --rm --name geth_aio_testnet --detach -p 8545:8545 -p 8546:8546 cactu
 
 ### Persistence Plugin
 
-Follow the instructions in the [plugin README file](https://github.com/hyperledger/cacti/tree/main/packages/cactus-plugin-persistence-ethereum).
+Follow the instructions in the [plugin README file](https://github.com/hyperledger-cacti/cacti/tree/main/packages/cactus-plugin-persistence-ethereum).
 
 To quickly set up the plugin for your Ethereum ledger, run the sample setup script:
 
diff --git a/docs/docs/cactus/ledger-browser/plugin-apps/fabric-browser.md b/docs/docs/cactus/ledger-browser/plugin-apps/fabric-browser.md
index 34f5cac733..30c56ec33d 100644
--- a/docs/docs/cactus/ledger-browser/plugin-apps/fabric-browser.md
+++ b/docs/docs/cactus/ledger-browser/plugin-apps/fabric-browser.md
@@ -21,13 +21,13 @@ Additionally, you'll need a `PostgreSQL connection string` to start the persiste
 
 ##### Expose custom schema
 
-Fabric data is stored in a custom schema named `fabric`. To access this data from our GUI application, you need to ensure the schema is exposed. If you're using our [supabase-all-in-one](https://github.com/hyperledger/cacti/tree/main/tools/docker/supabase-all-in-one) image, all application schemas, including `fabric`, are already exposed, so you can skip this step. However, if you're using Supabase Cloud, you'll need to go to the [API settings](https://supabase.com/dashboard/project/_/settings/api) and add `fabric` to the `Exposed schemas` list.
+Fabric data is stored in a custom schema named `fabric`. To access this data from our GUI application, you need to ensure the schema is exposed. If you're using our [supabase-all-in-one](https://github.com/hyperledger-cacti/cacti/tree/main/tools/docker/supabase-all-in-one) image, all application schemas, including `fabric`, are already exposed, so you can skip this step. However, if you're using Supabase Cloud, you'll need to go to the [API settings](https://supabase.com/dashboard/project/_/settings/api) and add `fabric` to the `Exposed schemas` list.
 
 For more details, refer to [the full guide on custom schemas](https://supabase.com/docs/guides/api/using-custom-schemas) (note that the necessary SQL code has already been executed during the persistence plugin schema setup).
 
 #### Fabric Ledger (Optional)
 
-This step is optional as you can use any running Fabric ledger. However, for testing purposes, you may use our [fabric-all-in-one](https://github.com/hyperledger/cacti/tree/main/tools/docker/fabric-all-in-one). To start it, execute the following commands from the root of your project:
+This step is optional as you can use any running Fabric ledger. However, for testing purposes, you may use our [fabric-all-in-one](https://github.com/hyperledger-cacti/cacti/tree/main/tools/docker/fabric-all-in-one). To start it, execute the following commands from the root of your project:
 
 ```shell
 # Build
@@ -39,7 +39,7 @@ docker run --detach --privileged --publish-all --name faio2x-testnet faio2x
 
 ### Persistence Plugin
 
-Follow the instructions in the [plugin README file](https://github.com/hyperledger/cacti/tree/main/packages/cactus-plugin-persistence-fabric).
+Follow the instructions in the [plugin README file](https://github.com/hyperledger-cacti/cacti/tree/main/packages/cactus-plugin-persistence-fabric).
 
 To quickly set up the plugin for your Fabric ledger, run the complete setup script:
 
diff --git a/docs/docs/cactus/whitepaper.md b/docs/docs/cactus/whitepaper.md
index 4711378684..a7cf08cc00 100644
--- a/docs/docs/cactus/whitepaper.md
+++ b/docs/docs/cactus/whitepaper.md
@@ -1,7 +1,7 @@
 Hyperledger Cactus White Paper
 ======================================================================================
 
-The white paper is presently undergoing a revision. Please visit the [repository](https://github.com/hyperledger/cacti/blob/main/whitepaper/whitepaper.md) for updates.
+The white paper is presently undergoing a revision. Please visit the [repository](https://github.com/hyperledger-cacti/cacti/blob/main/whitepaper/whitepaper.md) for updates.
 
 [Previous](contributing.md "Contributing") [Next](regulatory-and-industry-initiatives-reading-list.md "Regulatory and Industry Initiatives Reading List")
 
diff --git a/docs/docs/contact-us.md b/docs/docs/contact-us.md
index c1d7a1926c..ce92432f8a 100644
--- a/docs/docs/contact-us.md
+++ b/docs/docs/contact-us.md
@@ -6,4 +6,4 @@ You can contact us or seek help through the following channels:
   * Cacti contributors: [https://discord.com/channels/905194001349627914/908379338716631050](https://discord.com/channels/905194001349627914/908379338716631050)
   * Hyperledger: [https://discord.com/invite/hyperledger](https://discord.com/invite/hyperledger)
 
-The maintainers are [listed](https://github.com/hyperledger/cacti/blob/main/MAINTAINERS.md) in the GitHub repository.
+The maintainers are [listed](https://github.com/hyperledger-cacti/cacti/blob/main/MAINTAINERS.md) in the GitHub repository.
diff --git a/docs/docs/contributing/how-to-contribute.md b/docs/docs/contributing/how-to-contribute.md
index 145a57dd82..98504051aa 100644
--- a/docs/docs/contributing/how-to-contribute.md
+++ b/docs/docs/contributing/how-to-contribute.md
@@ -1,6 +1,6 @@
 # How to Contribute
 
-The Hyperledger Cacti repository contains [specific instructions](https://github.com/hyperledger/cacti/blob/main/CONTRIBUTING.md) for contributing to that project.
+The Hyperledger Cacti repository contains [specific instructions](https://github.com/hyperledger-cacti/cacti/blob/main/CONTRIBUTING.md) for contributing to that project.
 
 In this section, you will find generic instructions and guidelines for contributing to any Hyperledger project.
 
diff --git a/docs/docs/contributing/reporting-a-bug.md b/docs/docs/contributing/reporting-a-bug.md
index 9a1139bcbc..a40ee62750 100644
--- a/docs/docs/contributing/reporting-a-bug.md
+++ b/docs/docs/contributing/reporting-a-bug.md
@@ -11,4 +11,4 @@ When reporting an issue, please provide as much detail as possible about how to
 * Actual results
 * Expected results
 
-  [issue tracker]: https://github.com/hyperledger/cacti/issues
+  [issue tracker]: https://github.com/hyperledger-cacti/cacti/issues
diff --git a/docs/docs/contributing/requesting-a-change.md b/docs/docs/contributing/requesting-a-change.md
index ece4ea2a19..8261cc38ba 100644
--- a/docs/docs/contributing/requesting-a-change.md
+++ b/docs/docs/contributing/requesting-a-change.md
@@ -12,7 +12,7 @@ This guide is our best effort to explain the criteria and reasoning behind our
 decisions when evaluating change requests and considering them for
 implementation. 
 
-  [issue tracker]: https://github.com/hyperledger/cacti/issues
+  [issue tracker]: https://github.com/hyperledger-cacti/cacti/issues
 
 ## Before creating an issue
 
diff --git a/docs/docs/index.md b/docs/docs/index.md
index b58a7abc2f..8ae90f01f1 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -24,8 +24,8 @@ Client libraries and examples are provided in the following languages: JavaScrip
 
 * [Vision](./vision.md)
 * [Architecture](./architecture.md)
-* [Cactus whitepaper](https://github.com/hyperledger/cacti/blob/main/whitepaper/whitepaper.md)
-* [Weaver RFCs](https://github.com/hyperledger/cacti/tree/main/weaver/rfcs)
+* [Cactus whitepaper](https://github.com/hyperledger-cacti/cacti/blob/main/whitepaper/whitepaper.md)
+* [Weaver RFCs](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/rfcs)
 * [Running pipelines with Cactus packages](./cactus/)
 * [Running pipelines with Weaver packages](./weaver/)
 * [Open API Specifications](./references/openapi/index.md)
diff --git a/docs/docs/references/specs.md b/docs/docs/references/specs.md
index cbb84b7282..1dc6147357 100644
--- a/docs/docs/references/specs.md
+++ b/docs/docs/references/specs.md
@@ -2,8 +2,8 @@
 
 The two legacy projects that Cacti is comprised of have independent sets of design and interface specifications, including examples of usage, as follows:
 
-- **Cactus**: See the official [Cactus whitepaper](https://github.com/hyperledger/cacti/tree/main/whitepaper/whitepaper.md) for technical designs and usage.
-- **Weaver**: See the official [Weaver RFCs](https://github.com/hyperledger/cacti/tree/main/weaver/rfcs/) for technical designs and interface specifications.
+- **Cactus**: See the official [Cactus whitepaper](https://github.com/hyperledger-cacti/cacti/tree/main/whitepaper/whitepaper.md) for technical designs and usage.
+- **Weaver**: See the official [Weaver RFCs](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/rfcs/) for technical designs and interface specifications.
 
 !!! note
 
diff --git a/docs/docs/use-cases.md b/docs/docs/use-cases.md
index 2c50ad393c..5f6f23591c 100644
--- a/docs/docs/use-cases.md
+++ b/docs/docs/use-cases.md
@@ -1,3 +1,3 @@
 # Use Cases and Applications for Cacti
 
-This page is under construction. While we are working on it, you can find compelling examples and sample code [here](https://github.com/hyperledger/cacti/blob/main/whitepaper/whitepaper.md), [here](./weaver/user-stories/), [here](https://github.com/hyperledger/cacti/tree/main/examples), and [here](https://github.com/hyperledger/cacti/tree/main/weaver/samples).
+This page is under construction. While we are working on it, you can find compelling examples and sample code [here](https://github.com/hyperledger-cacti/cacti/blob/main/whitepaper/whitepaper.md), [here](./weaver/user-stories/), [here](https://github.com/hyperledger-cacti/cacti/tree/main/examples), and [here](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/samples).
diff --git a/docs/docs/vision.md b/docs/docs/vision.md
index 7f2799f0fc..6a8e7b00dd 100644
--- a/docs/docs/vision.md
+++ b/docs/docs/vision.md
@@ -18,4 +18,4 @@ The present (initial) version of the Cacti code base is simply an aggregation of
 
 ## Project Roadmap
 
-You can find the project roadmap in the [GitHub repository](https://github.com/hyperledger/cacti/blob/main/ROADMAP.md).
+You can find the project roadmap in the [GitHub repository](https://github.com/hyperledger-cacti/cacti/blob/main/ROADMAP.md).
diff --git a/docs/docs/weaver/getting-started/enabling-weaver-network/corda.md b/docs/docs/weaver/getting-started/enabling-weaver-network/corda.md
index bd526d71d4..288b585127 100644
--- a/docs/docs/weaver/getting-started/enabling-weaver-network/corda.md
+++ b/docs/docs/weaver/getting-started/enabling-weaver-network/corda.md
@@ -127,7 +127,7 @@ dependencies {
   implementation(group: 'org.hyperledger.cacti.weaver.protos', name: 'protos-java-kt', version: "2.0.0-rc.2")
 }
 ```
-(Or check out the [package website](https://github.com/hyperledger/cacti/packages/1856827) and select a different version.)
+(Or check out the [package website](https://github.com/hyperledger-cacti/cacti/packages/1856827) and select a different version.)
   
 #### For Identity Administration
 
@@ -171,7 +171,7 @@ Consider a scenario inspired by the [global trade use case](../../user-stories/g
 
 (In preparation, a suitable access control policy must be recorded on `tradelogisticschannel` in `trade-logistics-network`, and a suitable verification policy must be recorded in the vault of `trade-finance-network`. We will see how to do this in the [Startup and Bootstrap Weaver Components](#startup-and-bootstrap-weaver-components) section later.)
 
-You will need to insert some code in the client layer application that accepts a B/L and submits a `UploadBillOfLading` request in `trade-finance-network`. (No code changes need to be made in any application in the other network.) The logic to accept a B/L should be replaced (or you can simply add an alternative) by a call to the `InteroperableHelper.interopFlow` function offered by the [cacti-weaver-sdk-corda](https://github.com/hyperledger/cacti/packages/1856827) library. The following code sample illustrates this:
+You will need to insert some code in the client layer application that accepts a B/L and submits a `UploadBillOfLading` request in `trade-finance-network`. (No code changes need to be made in any application in the other network.) The logic to accept a B/L should be replaced (or you can simply add an alternative) by a call to the `InteroperableHelper.interopFlow` function offered by the [cacti-weaver-sdk-corda](https://github.com/hyperledger-cacti/cacti/packages/1856827) library. The following code sample illustrates this:
 
 ```kt
 import org.hyperledger.cacti.weaver.sdk.corda.InteroperableHelper
@@ -410,8 +410,8 @@ The asset exchange mode currently requires only the Interoperation CorDapp modul
 
 After bootstrapping the nodes folder, copy the following two CorDapps in `build/nodes/PartyA/cordapps` and `build/nodes/PartyB/cordapps` folders (`PartyA` and `PartyB` node names are for example only):
 
-- [org.hyperledger.cacti.weaver.imodule.corda.interop-contracts](https://github.com/hyperledger/cacti/packages/1856825)
-- [org.hyperledger.cacti.weaver.imodule.corda.interop-workflows](https://github.com/hyperledger/cacti/packages/1856826)
+- [org.hyperledger.cacti.weaver.imodule.corda.interop-contracts](https://github.com/hyperledger-cacti/cacti/packages/1856825)
+- [org.hyperledger.cacti.weaver.imodule.corda.interop-workflows](https://github.com/hyperledger-cacti/cacti/packages/1856826)
 
 | Notes |
 |:------|
@@ -425,8 +425,8 @@ Both the data sharing and asset transfer modes require the Interoperation CorDap
 
 After bootstrapping the nodes folder, copy the following two CorDapps in `build/nodes/PartyA/cordapps` and `build/nodes/PartyB/cordapps` folders (`PartyA` and `PartyB` node names are for example only):
 
-- [org.hyperledger.cacti.weaver.imodule.corda.interop-contracts](https://github.com/hyperledger/cacti/packages/1856825)
-- [org.hyperledger.cacti.weaver.imodule.corda.interop-workflows](https://github.com/hyperledger/cacti/packages/1856826)
+- [org.hyperledger.cacti.weaver.imodule.corda.interop-contracts](https://github.com/hyperledger-cacti/cacti/packages/1856825)
+- [org.hyperledger.cacti.weaver.imodule.corda.interop-workflows](https://github.com/hyperledger-cacti/cacti/packages/1856826)
 
 | Notes |
 |:------|
@@ -436,9 +436,9 @@ After bootstrapping the nodes folder, copy the following two CorDapps in `build/
 
 You need to run one or more relays for network-to-network communication. Here we provide instructions to run one relay running in a Docker container, which is sufficient for data sharing. (Later, we will provide instructions to run multiple relays, which will be useful from a failover perspective.)
 
-Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-relay-server) for the relay. Before launching a container, you just need to customize its configuration for your Fabric network, which you can do by simply creating a folder (let's call it `relay_config`) and configuring the following files in it:
+Weaver provides a [pre-built image](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-relay-server) for the relay. Before launching a container, you just need to customize its configuration for your Fabric network, which you can do by simply creating a folder (let's call it `relay_config`) and configuring the following files in it:
 
-- `.env`: This sets suitable environment variables within the relay container. Copy the `.env.template` file [from the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/relay/.env.template) and customize it for your purposes, as indicated in the below sample:
+- `.env`: This sets suitable environment variables within the relay container. Copy the `.env.template` file [from the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/relay/.env.template) and customize it for your purposes, as indicated in the below sample:
   ```
   PATH_TO_CONFIG=./config.toml
   RELAY_NAME=<"name" in config.toml>
@@ -451,9 +451,9 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
     - The `RELAY_NAME` variable specifies a unique name for this relay. It should match what's specified in the `config.toml` (more on that below).
     - The `RELAY_PORT` variable specifies the port this relay server will listen on. It should match what's specified in the `config.toml` (more on that below).
     - The `EXTERNAL_NETWORK` variable should be set to the [name](https://docs.docker.com/compose/networking/) of your Fabric network.
-    - The `DOCKER_*` variables are used to specify the image on which the container will be built. Make sure you set `DOCKER_TAG` to the latest version you see on [GitHub](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-relay-server).
+    - The `DOCKER_*` variables are used to specify the image on which the container will be built. Make sure you set `DOCKER_TAG` to the latest version you see on [GitHub](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-relay-server).
 
-  For more details, see the [Relay Docker README](https://github.com/hyperledger/cacti/blob/main/weaver/core/relay/relay-docker.md) ("Relay Server Image" and "Running With Docker Compose" sections).
+  For more details, see the [Relay Docker README](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/relay/relay-docker.md) ("Relay Server Image" and "Running With Docker Compose" sections).
 
 - `config.toml`: This is the file specified in the `PATH_TO_CONFIG` variable in the `.env`. It specifies properties of this relay and the driver(s) it supports. A sample is given below:
   ```toml
@@ -515,7 +515,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
   | You can specify more than one foreign relay instance in the `relays` section. |
   | You can specify more than one driver instance in the `drivers` section. |
 
-- `docker-compose.yaml`: This specifies the properties of the relay container. You can use the [file in the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/relay/docker-compose.yaml) verbatim.
+- `docker-compose.yaml`: This specifies the properties of the relay container. You can use the [file in the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/relay/docker-compose.yaml) verbatim.
 
 To start the relay server, navigate to the folder containing the above files and run the following:
 ```bash
@@ -526,9 +526,9 @@ docker compose up -d relay-server
 
 You need to run one or more drivers through which your relay can interact with your Corda network. Here we provide instructions to run one Corda driver running in a Docker container, which is sufficient for data sharing. (Later, we will provide instructions to run multiple drivers, which will be useful both from a failover perspective and to interact with different subsets of your Corda network.)
 
-Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-driver-corda) for the Corda driver. Before launching a container, you just need to customize the container configuration for your Corda network, which you can do by simply configuring the following:
+Weaver provides a [pre-built image](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-driver-corda) for the Corda driver. Before launching a container, you just need to customize the container configuration for your Corda network, which you can do by simply configuring the following:
 
-- `.env`: This sets suitable environment variables within the driver container. Copy the `.env.docker.template` file [from the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/drivers/corda-driver/.env.docker.template) and customize it for your purposes, as indicated in the below sample:
+- `.env`: This sets suitable environment variables within the driver container. Copy the `.env.docker.template` file [from the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/drivers/corda-driver/.env.docker.template) and customize it for your purposes, as indicated in the below sample:
   ```
   NETWORK_NAME=<container-name-suffix>
   DRIVER_PORT=<driver-server-port>
@@ -553,9 +553,9 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
     - **Enabling TLS**:
         - You can make your driver accept TLS connections by specifying `DRIVER_TLS` as `true` and specifying a TLS certificate file path and private key file path in `DRIVER_TLS_CERT_PATH` and `DRIVER_TLS_KEY_PATH` respectively. The same certificate should be specified in this driver's definition in the `drivers` section in the `config.toml` file of your relay in the `tlsca_cert_path` property (see the earlier section on relay configuration).
         - To communicate with your network' relay using TLS (i.e., if the relay is TLS-enabled), specify that relay's TLS CA certificate path in `RELAY_TLSCA_CERT_PATH` (currently only one certificate can be configured) and set `RELAY_TLS` to `true`. This CA certificate should match the one specified in the `cert_path` property in the relay's `config.toml` file (see the earlier section on relay configuration):
-        - You can point to the folder in your host system containing the certificate and key using the `TLS_CREDENTIALS_DIR` variable. (This folder will be synced to the `/corda-driver/credentials` folder in the Fabric Driver container as specified in the [docker compose file](https://github.com/hyperledger/cacti/blob/main/weaver/core/drivers/fabric-driver/docker-compose.yml).) Make sure you point to the right certificate and key file paths within the container using the `DRIVER_TLS_CERT_PATH`, `DRIVER_TLS_KEY_PATH`, and `RELAY_TLSCA_CERT_PATH` variables.
+        - You can point to the folder in your host system containing the certificate and key using the `TLS_CREDENTIALS_DIR` variable. (This folder will be synced to the `/corda-driver/credentials` folder in the Fabric Driver container as specified in the [docker compose file](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/drivers/fabric-driver/docker-compose.yml).) Make sure you point to the right certificate and key file paths within the container using the `DRIVER_TLS_CERT_PATH`, `DRIVER_TLS_KEY_PATH`, and `RELAY_TLSCA_CERT_PATH` variables.
 
-- `docker-compose.yaml`: This specifies the properties of the driver container. You can use the [file in the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/drivers/corda-driver/docker-compose.yml) verbatim.
+- `docker-compose.yaml`: This specifies the properties of the driver container. You can use the [file in the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/drivers/corda-driver/docker-compose.yml) verbatim.
 
 To start the driver, navigate to the folder containing the above files and run the following:
 ```bash
@@ -564,7 +564,7 @@ docker compose up -d
 
 #### Vault Initialization
 
-To prepare your network for interoperation with a foreign network, you need to record the following to your vault using the [Corda SDK](https://github.com/hyperledger/cacti/packages/1856827) (`org.hyperledger.cacti.weaver.sdk.corda.weaver-sdk-corda`):
+To prepare your network for interoperation with a foreign network, you need to record the following to your vault using the [Corda SDK](https://github.com/hyperledger-cacti/cacti/packages/1856827) (`org.hyperledger.cacti.weaver.sdk.corda.weaver-sdk-corda`):
 
 - **Access control policies**:
   Let's take the example of the request made from `trade-finance-network` to `trade-logistics-network` for a B/L earlier in this document. `trade-logistics-network` can have a policy of the following form permitting access to the `GetBillOfLading` function from a client representing the `PartyA` node in `trade-finance-network` as follows:
@@ -614,7 +614,7 @@ To prepare your network for interoperation with a foreign network, you need to r
   |:------|
   | If the remote network is built on Corda, the resource specified in the access control policy can be used here as the `pattern`, with different node names specified in the `criteria`. |
 
-  You need to record this policy rule on your Corda network's vault by invoking Corda sdk's function `VerificationPolicyManager.createVerificationPolicyState(proxy, verificationPolicyProto)`, where `proxy` is an instance of `CordaRPCOps` as described in previous sections, and `verificationPolicyProto` is an object of protobuf `org.hyperledger.cacti.weaver.protos.common.verification_policy.VerificationPolicyOuterClass.VerificationPolicy`. You can examine the full proto structure [here](https://github.com/hyperledger/cacti/blob/main/weaver/common/protos/common/verification_policy.proto). (_Google's protobuf library can be used to convert above JSON to protobuf object._)
+  You need to record this policy rule on your Corda network's vault by invoking Corda sdk's function `VerificationPolicyManager.createVerificationPolicyState(proxy, verificationPolicyProto)`, where `proxy` is an instance of `CordaRPCOps` as described in previous sections, and `verificationPolicyProto` is an object of protobuf `org.hyperledger.cacti.weaver.protos.common.verification_policy.VerificationPolicyOuterClass.VerificationPolicy`. You can examine the full proto structure [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/common/protos/common/verification_policy.proto). (_Google's protobuf library can be used to convert above JSON to protobuf object._)
 
   | Notes |
   |:------|
diff --git a/docs/docs/weaver/getting-started/enabling-weaver-network/fabric.md b/docs/docs/weaver/getting-started/enabling-weaver-network/fabric.md
index a8ded4578d..b58f5b24f4 100644
--- a/docs/docs/weaver/getting-started/enabling-weaver-network/fabric.md
+++ b/docs/docs/weaver/getting-started/enabling-weaver-network/fabric.md
@@ -107,8 +107,8 @@ Below, we list the template functions with sample code that you, as a developer,
            return contractId, nil
        }
        ```
-       Here `assetExchangeAgreementSerializedProto64` is a serialized protobuf in Base64 encoded string of `AssetExchangeAgreement` protobuf structure, and can be used to extract details like asset id, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
-       Similarly `lockInfoSerializedProto64` is a serialized protobuf in Base64 encoded string of `AssetLock` protobuf structure. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-locks-on-assets).
+       Here `assetExchangeAgreementSerializedProto64` is a serialized protobuf in Base64 encoded string of `AssetExchangeAgreement` protobuf structure, and can be used to extract details like asset id, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
+       Similarly `lockInfoSerializedProto64` is a serialized protobuf in Base64 encoded string of `AssetLock` protobuf structure. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-locks-on-assets).
     2. **LockFungibleAsset**
        ```go
        func (s *SmartContract) LockFungibleAsset(ctx contractapi.TransactionContextInterface, fungibleAssetExchangeAgreementSerializedProto64 string, lockInfoSerializedProto64 string) (string, error) {
@@ -123,7 +123,7 @@ Below, we list the template functions with sample code that you, as a developer,
            return contractId, nil
        }
        ```
-       Here `fungibleAssetExchangeAgreementSerializedProto64` is a serialized protobuf in Base64 encoded string of `FungibleAssetExchangeAgreement` protobuf structure, and can be used to extract details like asset quantity, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
+       Here `fungibleAssetExchangeAgreementSerializedProto64` is a serialized protobuf in Base64 encoded string of `FungibleAssetExchangeAgreement` protobuf structure, and can be used to extract details like asset quantity, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
     3. **IsAssetLockedQueryUsingContractId**
        ```go
        func (s *SmartContract) IsAssetLockedQueryUsingContractId(ctx contractapi.TransactionContextInterface, contractId string) (bool, error) {
@@ -169,7 +169,7 @@ Below, we list the template functions with sample code that you, as a developer,
   }
   ```
 
-  There is an alternative API to implement asset exchange using this library, which doesn't involve contract IDs. For details, see the [Asset Exchange Library README](https://github.com/hyperledger/cacti/blob/main/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md#without-contractid).
+  There is an alternative API to implement asset exchange using this library, which doesn't involve contract IDs. For details, see the [Asset Exchange Library README](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md#without-contractid).
         
 - _Using the [`Fabric Interoperation Chaincode`](https://pkg.go.dev/github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/contracts/interop/v2)_: This method requires the Fabric Interoperation Chaincode to be installed on all peers of the channel, using a special chaincode ID (e.g., `interop`, which is what we will use later in this document). Your application chaincode needs to implement the interface `github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2`.
   In your smart contract's `go.mod`, add the following in the `require` section (update the version to the latest Cacti version):
@@ -207,8 +207,8 @@ Below, we list the template functions with sample code that you, as a developer,
            return contractId, nil
        }
        ```
-       Here `assetExchangeAgreementSerializedProto64` is a serialized protobuf in Base64 encoded string of `AssetExchangeAgreement` protobuf structure, and can be used to extract details like asset id, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
-       Similarly `lockInfoSerializedProto64` is a serialized protobuf in Base64 encoded string of `AssetLock` protobuf structure. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-locks-on-assets).
+       Here `assetExchangeAgreementSerializedProto64` is a serialized protobuf in Base64 encoded string of `AssetExchangeAgreement` protobuf structure, and can be used to extract details like asset id, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
+       Similarly `lockInfoSerializedProto64` is a serialized protobuf in Base64 encoded string of `AssetLock` protobuf structure. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-locks-on-assets).
     2. **LockFungibleAsset**
        ```go
        func (s *SmartContract) LockFungibleAsset(ctx contractapi.TransactionContextInterface, fungibleAssetExchangeAgreementSerializedProto64 string, lockInfoSerializedProto64 string) (string, error) {
@@ -223,7 +223,7 @@ Below, we list the template functions with sample code that you, as a developer,
            return contractId, nil
        }
        ```
-       Here `fungibleAssetExchangeAgreementSerializedProto64` is a serialized protobuf in Base64 encoded string of `FungibleAssetExchangeAgreement` protobuf structure, and can be used to extract details like asset quantity, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
+       Here `fungibleAssetExchangeAgreementSerializedProto64` is a serialized protobuf in Base64 encoded string of `FungibleAssetExchangeAgreement` protobuf structure, and can be used to extract details like asset quantity, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
     3. **IsAssetLockedQueryUsingContractId**
        ```go
        func (s *SmartContract) IsAssetLockedQueryUsingContractId(ctx contractapi.TransactionContextInterface, contractId string) (bool, error) {
@@ -284,7 +284,7 @@ To import and use the Weaver SDK, you need to add the following dependency to th
 ```json
 "@hyperledger/cacti-weaver-sdk-fabric": "latest",
 ```
-(Instead of `latest`, you can select a particular version from the [package website](https://github.com/hyperledger/cacti/pkgs/npm/cacti-weaver-sdk-fabric).)
+(Instead of `latest`, you can select a particular version from the [package website](https://github.com/hyperledger-cacti/cacti/pkgs/npm/cacti-weaver-sdk-fabric).)
 
 Before you run `npm install` to fetch the dependencies, make sure you create a [personal access token](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) with `read:packages` access in GitHub. Create an `.npmrc` file in the same folder as the `package.json` with the following contents:
 
@@ -327,7 +327,7 @@ Consider a scenario inspired by the [global trade use case](../../user-stories/g
       
 (In preparation, a suitable access control policy must be recorded on `tradelogisticschannel` in `trade-logistics-network`, and a suitable verification policy must be recorded on `tradefinancechannel` in `trade-finance-network`. We will see how to do this in the "Startup and Boostrap" section later.)
 
-You will need to insert some code in the Layer-2 application that accepts a B/L and submits a `RecordBillOfLading` transaction in `trade-finance-network`. (No code changes need to be made in any application in the other network.) The logic to accept a B/L should be replaced (or you can simply add an alternative) by a call to the `interopFlow` function offered by the [cacti-weaver-sdk-fabric](https://github.com/hyperledger/cacti/pkgs/npm/cacti-weaver-sdk-fabric) library (there's an [equivalent library in Golang](https://github.com/hyperledger/cacti/releases/tag/weaver%2Fsdks%2Ffabric%2Fgo-sdk%2Fv2.0.0-rc.2) too). The following code sample illustrates this (the Golang equivalent is left to the reader):
+You will need to insert some code in the Layer-2 application that accepts a B/L and submits a `RecordBillOfLading` transaction in `trade-finance-network`. (No code changes need to be made in any application in the other network.) The logic to accept a B/L should be replaced (or you can simply add an alternative) by a call to the `interopFlow` function offered by the [cacti-weaver-sdk-fabric](https://github.com/hyperledger-cacti/cacti/pkgs/npm/cacti-weaver-sdk-fabric) library (there's an [equivalent library in Golang](https://github.com/hyperledger-cacti/cacti/releases/tag/weaver%2Fsdks%2Ffabric%2Fgo-sdk%2Fv2.0.0-rc.2) too). The following code sample illustrates this (the Golang equivalent is left to the reader):
 ```js
 const ihelper = require('@hyperledger/cacti-weaver-sdk-fabric').InteroperableHelper;
 const interopcc = <handle-to-fabric-interop-chaincode>;   // Use Fabric SDK functions: (new Gateway()).getNetwork(...).getContract(<fabric-interop-chaincode-id>)
@@ -527,9 +527,9 @@ Install the Fabric Interoperation Chaincode in the relevant channel(s), i.e., th
 
 You need to run one or more relays for network-to-network communication. Here we provide instructions to run one relay running in a Docker container, which is sufficient for data sharing. (Later, we will provide instructions to run multiple relays, which will be useful from a failover perspective.)
 
-Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-relay-server) for the relay. Before launching a container, you just need to customize its configuration for your Fabric network, which you can do by simply creating a folder (let's call it `relay_config`) and configuring the following files in it:
+Weaver provides a [pre-built image](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-relay-server) for the relay. Before launching a container, you just need to customize its configuration for your Fabric network, which you can do by simply creating a folder (let's call it `relay_config`) and configuring the following files in it:
 
-- `.env`: This sets suitable environment variables within the relay container. Copy the `.env.template` file [from the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/relay/.env.template) and customize it for your purposes, as indicated in the below sample:
+- `.env`: This sets suitable environment variables within the relay container. Copy the `.env.template` file [from the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/relay/.env.template) and customize it for your purposes, as indicated in the below sample:
   ```
   PATH_TO_CONFIG=./config.toml
   RELAY_NAME=<"name" in config.toml>
@@ -544,7 +544,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
     - The `EXTERNAL_NETWORK` variable should be set to the [name](https://docs.docker.com/compose/networking/) of your Fabric network.
     - The `DOCKER_*` variables are used to specify the image on which the container will be built. Make sure you set `DOCKER_TAG` to the latest version you see on [GitHub](ility/pkgs/container/weaver-relay-server).
 
-    For more details, see the [Relay Docker README](https://github.com/hyperledger/cacti/blob/main/weaver/core/relay/relay-docker.md) ("Relay Server Image" and "Running With Docker Compose" sections).
+    For more details, see the [Relay Docker README](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/relay/relay-docker.md) ("Relay Server Image" and "Running With Docker Compose" sections).
 
 - `config.toml`: This is the file specified in the `PATH_TO_CONFIG` variable in the `.env`. It specifies properties of this relay and the driver(s) it supports. A sample is given below:
   ```toml
@@ -606,7 +606,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
   | You can specify more than one foreign relay instance in the `relays` section. |
   | You can specify more than one driver instance in the `drivers` section. |
 
-- `docker-compose.yaml`: This specifies the properties of the relay container. You can use the [file in the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/relay/docker-compose.yaml) verbatim.
+- `docker-compose.yaml`: This specifies the properties of the relay container. You can use the [file in the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/relay/docker-compose.yaml) verbatim.
 
 To start the relay server, navigate to the folder containing the above files and run the following:
 ```bash
@@ -617,9 +617,9 @@ docker compose up -d relay-server
 
 You need to run one or more drivers through which your relay can interact with your Fabric network. Here we provide instructions to run one Fabric driver running in a Docker container, which is sufficient for data sharing. (Later, we will provide instructions to run multiple drivers, which will be useful both from a failover perspective and to interact with different subsets of your Fabric network, like private data collections.)
 
-Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-driver-fabric) for the Fabric driver. Before launching a container, you just need to customize its configuration for your Fabric network, which you can do by simply creating a folder (let's call it `driver_config`) and configuring the following files in it:
+Weaver provides a [pre-built image](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-driver-fabric) for the Fabric driver. Before launching a container, you just need to customize its configuration for your Fabric network, which you can do by simply creating a folder (let's call it `driver_config`) and configuring the following files in it:
 
-- `.env`: This sets suitable environment variables within the driver container. Copy the `.env.docker.template` file [from the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/drivers/fabric-driver/.env.docker.template) and customize it for your purposes, as indicated in the below sample:
+- `.env`: This sets suitable environment variables within the driver container. Copy the `.env.docker.template` file [from the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/drivers/fabric-driver/.env.docker.template) and customize it for your purposes, as indicated in the below sample:
   ```
   CONNECTION_PROFILE=<path_to_connection_profile>
   DRIVER_CONFIG=./config.json
@@ -647,7 +647,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
     - **Enabling TLS**:
         - You can make your driver accept TLS connections by specifying `DRIVER_TLS` as `true` and specifying a TLS certificate file path and private key file path in `DRIVER_TLS_CERT_PATH` and `DRIVER_TLS_KEY_PATH` respectively. The same certificate should be specified in this driver's definition in the `drivers` section in the `config.toml` file of your relay in the `tlsca_cert_path` property (see the earlier section on relay configuration).
         - To communicate with your network' relay using TLS (i.e., if the relay is TLS-enabled), specify that relay's TLS CA certificate path in `RELAY_TLSCA_CERT_PATH` (currently only one certificate can be configured) and set `RELAY_TLS` to `true`. This CA certificate should match the one specified in the `cert_path` property in the relay's `config.toml` file (see the earlier section on relay configuration):
-        - You can point to the folder in your host system containing the certificate and key using the `TLS_CREDENTIALS_DIR` variable. (This folder will be synced to the `/fabric-driver/credentials` folder in the Fabric Driver container as specified in the [docker compose file](https://github.com/hyperledger/cacti/blob/main/weaver/core/drivers/fabric-driver/docker-compose.yml).) Make sure you point to the right certificate and key file paths within the container using the `DRIVER_TLS_CERT_PATH`, `DRIVER_TLS_KEY_PATH`, and `RELAY_TLSCA_CERT_PATH` variables.
+        - You can point to the folder in your host system containing the certificate and key using the `TLS_CREDENTIALS_DIR` variable. (This folder will be synced to the `/fabric-driver/credentials` folder in the Fabric Driver container as specified in the [docker compose file](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/drivers/fabric-driver/docker-compose.yml).) Make sure you point to the right certificate and key file paths within the container using the `DRIVER_TLS_CERT_PATH`, `DRIVER_TLS_KEY_PATH`, and `RELAY_TLSCA_CERT_PATH` variables.
 
 - `config.json`: This contains settings used to connect to a CA of a Fabric network organization and enroll a client. A sample is given below:
   ```json
@@ -675,7 +675,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
   |:------|
   | If your connection profile already contains specifications for a CA server, you can leave the `<ca-service-endpoint>` value as a blank. |
 
-- `docker-compose.yaml`: This specifies the properties of the driver container. You can use the [file in the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/drivers/fabric-driver/docker-compose.yml) verbatim.
+- `docker-compose.yaml`: This specifies the properties of the driver container. You can use the [file in the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/drivers/fabric-driver/docker-compose.yml) verbatim.
 
 To start the driver, navigate to the folder containing the above files and run the following:
 ```bash
@@ -686,7 +686,7 @@ docker compose up -d
 
 You need to run one IIN Agent for each organization in the Fabric network channel you are enabling Weaver in. This agent runs a protocol with other organizations' agents and with targeted foreign networks' agents to sync and record foreign networks' memberships to the channel ledger.
 
-Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-iin-agent) for the IIN Agent. Before launching a container, you just need to customize its configuration for your Fabric network organization, which you can do by simply creating a folder (let's call it `iin_agent_config_<orgname>`) and configuring the following files in it:
+Weaver provides a [pre-built image](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-iin-agent) for the IIN Agent. Before launching a container, you just need to customize its configuration for your Fabric network organization, which you can do by simply creating a folder (let's call it `iin_agent_config_<orgname>`) and configuring the following files in it:
 
 - `config.json`: This contains settings used to connect to a Fabric network organization and its CA (part of the organization's MSP). A sample is given below:
   ```
@@ -753,7 +753,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
   }
   ```
 
-- `.env`: This sets suitable environment variables within the driver container. Copy the `.env.template` file [from the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/identity-management/iin-agent/.env.docker.template) and customize it for your purposes, as indicated in the below sample:
+- `.env`: This sets suitable environment variables within the driver container. Copy the `.env.template` file [from the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/identity-management/iin-agent/.env.docker.template) and customize it for your purposes, as indicated in the below sample:
   ```
   IIN_AGENT_PORT=<iin-agent-server-port>
   IIN_AGENT_TLS=<true/false>
@@ -786,13 +786,13 @@ Weaver provides a [pre-built image](https://github.com/hyperledger/cacti/pkgs/co
     - `WEAVER_CONTRACT_ID`: Contract ID for DLT specific Weaver interoperation module installed on network
     - `SYNC_PERIOD`: Period at which auto synchronization of memberships from other security domains should happen
     - `AUTO_SYNC`: Set this to `true` to enable auto synchronization of memberships from other security domains
-    - `DOCKER_TAG`: Set this to the desired version of the Weaver IIN Agent [docker image](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-iin-agent)
+    - `DOCKER_TAG`: Set this to the desired version of the Weaver IIN Agent [docker image](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-iin-agent)
     - `EXTERNAL_NETWORK`: Set to the network [name](https://docs.docker.com/compose/networking/) of your Fabric network.
     - **Enabling TLS**:
         - Make your IIN Agent accept TLS connections by specifying `IIN_AGENT_TLS` as `true` and specifying a TLS certificate file path and private key file path in `IIN_AGENT_TLS_CERT_PATH` and `IIN_AGENT_TLS_KEY_PATH` respectively. The same certificate should be specified in this agent's JSON object in another agent's `dnsconfig.json` file under the appropriate security domain and IIN Agent ID scope.
-        - You can point to the folder in your host system containing the certificate and key using the `TLS_CREDENTIALS_DIR` variable. (This folder will be synced to the `/opt/iinagent/credentials` folder in the IIN Agent container as specified in the [docker compose file](https://github.com/hyperledger/cacti/blob/main/weaver/core/identity-management/iin-agent/docker-compose.yml).) Make sure you point to the right certificate and key file paths within the container using the `IIN_AGENT_TLS_CERT_PATH` and `IIN_AGENT_TLS_KEY_PATH` variables respectively.
+        - You can point to the folder in your host system containing the certificate and key using the `TLS_CREDENTIALS_DIR` variable. (This folder will be synced to the `/opt/iinagent/credentials` folder in the IIN Agent container as specified in the [docker compose file](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/identity-management/iin-agent/docker-compose.yml).) Make sure you point to the right certificate and key file paths within the container using the `IIN_AGENT_TLS_CERT_PATH` and `IIN_AGENT_TLS_KEY_PATH` variables respectively.
 
-- `docker-compose.yaml`: This specifies the properties of the IIN agent container. You can use the [file in the repository](https://github.com/hyperledger/cacti/blob/main/weaver/core/identity-management/iin-agent/docker-compose.yml) verbatim.
+- `docker-compose.yaml`: This specifies the properties of the IIN agent container. You can use the [file in the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/identity-management/iin-agent/docker-compose.yml) verbatim.
 
 Now to start the IIN agent, navigate to the folder containing the above files and run the following:
 ```bash
diff --git a/docs/docs/weaver/getting-started/guide.md b/docs/docs/weaver/getting-started/guide.md
index 81fab08518..c3f7364e80 100644
--- a/docs/docs/weaver/getting-started/guide.md
+++ b/docs/docs/weaver/getting-started/guide.md
@@ -19,16 +19,16 @@ The easiest way to understand how Weaver works is to run it at a small scale:
 - (To bring down the test networks, go back to the "Setup" pages and follow instructions in the respective "Teardown" sections.)
 - After you run these tests and get a flavor of how the system and protocols work, you will be ready to move on to "real" networks, enhancing them with interoperation capabilities by incorporating Weaver into them. Check out the guidelines and templates for [Fabric](./enabling-weaver-network/fabric.md), [Corda](./enabling-weaver-network/corda.md), and [Besu](./enabling-weaver-network/besu.md) networks.
 
-If you wish to go further and understand Weaver specifics, dig into the code, or contribute to the open-source project, check out the [project repository](https://github.com/hyperledger/cacti/weaver). For specific information about individual Weaver components, see:
+If you wish to go further and understand Weaver specifics, dig into the code, or contribute to the open-source project, check out the [project repository](https://github.com/hyperledger-cacti/cacti/weaver). For specific information about individual Weaver components, see:
 
-- [Relay](https://github.com/hyperledger/cacti/blob/main/weaver/core/relay/README.md) module
-- [Fabric](https://github.com/hyperledger/cacti/blob/main/weaver/core/drivers/fabric-driver/readme.md) and [Corda](https://github.com/hyperledger/cacti/blob/main/weaver/core/drivers/corda-driver/README.md) drivers
-- [Fabric Interoperation Chaincode](https://github.com/hyperledger/cacti/blob/main/weaver/core/network/fabric-interop-cc/README.md), [Interoperation CorDapp](https://github.com/hyperledger/cacti/blob/main/weaver/core/network/corda-interop-app/README.md), and [Besu Interoperation Contract](https://github.com/hyperledger/cacti/blob/main/weaver/core/network/besu/README.md)
-- Common [protobufs](https://github.com/hyperledger/cacti/tree/main/weaver/common/protos): compiled in [JavaScript](https://github.com/hyperledger/cacti/blob/main/weaver/common/protos-js/README.md), [Golang](https://github.com/hyperledger/cacti/blob/main/weaver/common/protos-go/README.md), [Java](https://github.com/hyperledger/cacti/blob/main/weaver/common/protos-java-kt/README.md), [Rust](https://github.com/hyperledger/cacti/blob/main/weaver/common/protos-rs/README.md) and [Solidity](https://github.com/hyperledger/cacti/blob/main/weaver/common/protos-sol/README.md)
-- Fabric Interoperation SDKs in [Node.js](https://github.com/hyperledger/cacti/blob/main/weaver/sdks/fabric/interoperation-node-sdk/README.md) and [Golang](https://github.com/hyperledger/cacti/blob/main/weaver/sdks/fabric/go-sdk/readme.md)
-- Corda Interoperation SDK in [Kotlin/Java](https://github.com/hyperledger/cacti/blob/main/weaver/sdks/corda/README.md) 
-- Besu Interoperation SDK in [Node.js](https://github.com/hyperledger/cacti/blob/main/weaver/sdks/besu/interoperation-node-sdk/README.md) 
-- Sample [Fabric](https://github.com/hyperledger/cacti/tree/main/weaver/samples/fabric) and [Corda](https://github.com/hyperledger/cacti/tree/main/weaver/samples/corda) applications for experimentation and testing
-- [Fabric](https://github.com/hyperledger/cacti/blob/main/weaver/tests/network-setups/fabric/dev/README.md), [Corda](https://github.com/hyperledger/cacti/blob/main/weaver/tests/network-setups/corda/README.md), and [Besu](https://github.com/hyperledger/cacti/blob/main/weaver/tests/network-setups/besu/README.md) test network setups
+- [Relay](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/relay/README.md) module
+- [Fabric](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/drivers/fabric-driver/readme.md) and [Corda](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/drivers/corda-driver/README.md) drivers
+- [Fabric Interoperation Chaincode](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/network/fabric-interop-cc/README.md), [Interoperation CorDapp](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/network/corda-interop-app/README.md), and [Besu Interoperation Contract](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/core/network/besu/README.md)
+- Common [protobufs](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/common/protos): compiled in [JavaScript](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/common/protos-js/README.md), [Golang](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/common/protos-go/README.md), [Java](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/common/protos-java-kt/README.md), [Rust](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/common/protos-rs/README.md) and [Solidity](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/common/protos-sol/README.md)
+- Fabric Interoperation SDKs in [Node.js](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/sdks/fabric/interoperation-node-sdk/README.md) and [Golang](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/sdks/fabric/go-sdk/readme.md)
+- Corda Interoperation SDK in [Kotlin/Java](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/sdks/corda/README.md) 
+- Besu Interoperation SDK in [Node.js](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/sdks/besu/interoperation-node-sdk/README.md) 
+- Sample [Fabric](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/samples/fabric) and [Corda](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/samples/corda) applications for experimentation and testing
+- [Fabric](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/tests/network-setups/fabric/dev/README.md), [Corda](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/tests/network-setups/corda/README.md), and [Besu](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/tests/network-setups/besu/README.md) test network setups
 
-The Weaver [RFCs](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/README.md) contain detailed specifications of the models, data structures, protocols, and message formats.
+The Weaver [RFCs](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/README.md) contain detailed specifications of the models, data structures, protocols, and message formats.
diff --git a/docs/docs/weaver/getting-started/test-network/overview.md b/docs/docs/weaver/getting-started/test-network/overview.md
index 719f194103..33b40dff71 100644
--- a/docs/docs/weaver/getting-started/test-network/overview.md
+++ b/docs/docs/weaver/getting-started/test-network/overview.md
@@ -11,19 +11,19 @@ title: Component Overview
 
 Weaver offers a basic test network launching capability, both to demonstrate interoperation modes and to serve as a testbed for development and prototyping. Different modes (or scenarios) require different sets of components, but collectively you will need to run the following:
 
-- [Fabric testnet](https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/fabric/dev) - A pair of basic Fabric networks for testing interop flows
-- [Corda testnet](https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/corda) - A pair of basic Corda networks for testing interop flows
-- [Besu testnet](https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/besu) - A pair of basic Besu networks for testing interop flows
-- [Relay](https://github.com/hyperledger/cacti/tree/main/weaver/core/relay) - The server module and protocol for cross-DLT interoperability. An instance of this is needed for every Fabric and Corda network
-- [Fabric driver](https://github.com/hyperledger/cacti/tree/main/weaver/core/drivers/fabric-driver) - Driver used by the Fabric networks relay to communicate with the Fabric testnet
-- [Corda driver](https://github.com/hyperledger/cacti/tree/main/weaver/core/drivers/corda-driver) - Driver used by the Corda networks relay to communicate with the Corda testnet
-- [Fabric Interop chaincode](https://github.com/hyperledger/cacti/tree/main/weaver/core/network/fabric-interop-cc) - The Fabric interoperability contracts handle the dual process of servicing requests for views from external networks, and verifying requested views for integrity
-- [Corda interop app](https://github.com/hyperledger/cacti/tree/main/weaver/core/network/corda-interop-app) CorDapp used to handle interop duties between the relay and the application
-- [Besu interop contract](https://github.com/hyperledger/cacti/tree/main/weaver/core/network/besu/contracts/interop) Solidity smart contract(s) used to handle interop duties for a Besu network
-- [Fabric client](https://github.com/hyperledger/cacti/tree/main/weaver/samples/fabric/fabric-cli) - Fabric client used to trigger interop flows initiated from the Fabric side and to manage Fabric state
-- [Corda client app](https://github.com/hyperledger/cacti/tree/main/weaver/samples/corda/corda-simple-application) - CorDapp and client used to trigger interop flows initiated from the Corda side and to manage Corda state
-- [Besu sample application](https://github.com/hyperledger/cacti/tree/main/weaver/samples/besu/simpleasset) - A sample application for asset exchange across two besu networks using HTLC
-- [Besu client app](https://github.com/hyperledger/cacti/tree/main/weaver/samples/besu/besu-cli) - Besu client used to interact with the contracts deployed on the Besu testnet
+- [Fabric testnet](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/fabric/dev) - A pair of basic Fabric networks for testing interop flows
+- [Corda testnet](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/corda) - A pair of basic Corda networks for testing interop flows
+- [Besu testnet](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/besu) - A pair of basic Besu networks for testing interop flows
+- [Relay](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/relay) - The server module and protocol for cross-DLT interoperability. An instance of this is needed for every Fabric and Corda network
+- [Fabric driver](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/drivers/fabric-driver) - Driver used by the Fabric networks relay to communicate with the Fabric testnet
+- [Corda driver](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/drivers/corda-driver) - Driver used by the Corda networks relay to communicate with the Corda testnet
+- [Fabric Interop chaincode](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/network/fabric-interop-cc) - The Fabric interoperability contracts handle the dual process of servicing requests for views from external networks, and verifying requested views for integrity
+- [Corda interop app](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/network/corda-interop-app) CorDapp used to handle interop duties between the relay and the application
+- [Besu interop contract](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/network/besu/contracts/interop) Solidity smart contract(s) used to handle interop duties for a Besu network
+- [Fabric client](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/samples/fabric/fabric-cli) - Fabric client used to trigger interop flows initiated from the Fabric side and to manage Fabric state
+- [Corda client app](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/samples/corda/corda-simple-application) - CorDapp and client used to trigger interop flows initiated from the Corda side and to manage Corda state
+- [Besu sample application](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/samples/besu/simpleasset) - A sample application for asset exchange across two besu networks using HTLC
+- [Besu client app](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/samples/besu/besu-cli) - Besu client used to interact with the contracts deployed on the Besu testnet
 
 You can launch these components in one of several different ways:
 
diff --git a/docs/docs/weaver/getting-started/test-network/setup-local-docker.md b/docs/docs/weaver/getting-started/test-network/setup-local-docker.md
index 9874b96b37..dda91518c9 100644
--- a/docs/docs/weaver/getting-started/test-network/setup-local-docker.md
+++ b/docs/docs/weaver/getting-started/test-network/setup-local-docker.md
@@ -168,7 +168,7 @@ Follow the instructions below to build and launch the networks:
 | If you do not wish to test Fabric-Fabric interoperation, you can choose to launch only one of the two networks along with its interoperation chaincode. For `network1`, run `make start-interop-network1-local`, and for `network2`, run `make start-interop-network2-local` |
 | If you wish to enable end-to-end confidentiality by default in the interoperation modules that are deployed during network launch, set the environment variable `E2E_CONFIDENTIALITY` to `true` in the command line as follows: `E2E_CONFIDENTIALITY=true make start-interop-local` |
 
-For more information, refer to the associated [README](https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/fabric/dev).
+For more information, refer to the associated [README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/fabric/dev).
 
 **Troubleshooting Tips**:
 
@@ -219,7 +219,7 @@ make build-server-local
   make convert-compose-method1
   ```
 
-For more information, see the [relay-docker README](https://github.com/hyperledger/cacti/tree/main/weaver/core/relay/relay-docker.md).
+For more information, see the [relay-docker README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/relay/relay-docker.md).
 
 ### Fabric Driver
 
diff --git a/docs/docs/weaver/getting-started/test-network/setup-local.md b/docs/docs/weaver/getting-started/test-network/setup-local.md
index bb3d02eacd..8fe5b8ae7f 100644
--- a/docs/docs/weaver/getting-started/test-network/setup-local.md
+++ b/docs/docs/weaver/getting-started/test-network/setup-local.md
@@ -175,7 +175,7 @@ Follow the instructions below to build and launch the networks:
 | If you do not wish to test Fabric-Fabric interoperation, you can choose to launch only one of the two networks along with its interoperation chaincode. For `network1`, run `make start-interop-network1-local`, and for `network2`, run `make start-interop-network2-local` |
 | If you wish to enable end-to-end confidentiality by default in the interoperation modules that are deployed during network launch, set the environment variable `E2E_CONFIDENTIALITY` to `true` in the command line as follows: `E2E_CONFIDENTIALITY=true make start-interop-local` |
 
-For more information, refer to the associated [README](https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/fabric/dev).
+For more information, refer to the associated [README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/fabric/dev).
 
 **Troubleshooting Tips**:
 
@@ -321,7 +321,7 @@ Run a relay for `network2` as follows (_do this only if you have launched both F
   RELAY_CONFIG=config/Fabric_Relay2.toml cargo run --bin server
   ```
 
-For more information, see the [relay README](https://github.com/hyperledger/cacti/tree/main/weaver/core/relay).
+For more information, see the [relay README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/relay).
 
 
 ### Fabric Driver
@@ -864,7 +864,7 @@ Follow the instructions below to build and launch the networks:
 |:------|
 | If you do not wish to test Besu-Besu interoperation, you can choose to launch only one of the two networks. For `Network1`, run `make start-network1`, and for `Network2`, run `make start-network2` |
 
-For more information, refer to the associated [README](https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/besu).
+For more information, refer to the associated [README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/besu).
 
 ### Contracts
 
diff --git a/docs/docs/weaver/getting-started/test-network/setup-packages-docker.md b/docs/docs/weaver/getting-started/test-network/setup-packages-docker.md
index a0539e83bb..e806220a0b 100644
--- a/docs/docs/weaver/getting-started/test-network/setup-packages-docker.md
+++ b/docs/docs/weaver/getting-started/test-network/setup-packages-docker.md
@@ -95,7 +95,7 @@ Follow the instructions below to build and launch the networks:
 | If you do not wish to test Fabric-Fabric interoperation, you can choose to launch only one of the two networks along with its interoperation chaincode. For `network1`, run `make start-interop-network1`, and for `network2`, run `make start-interop-network2` |
 | If you wish to enable end-to-end confidentiality by default in the interoperation modules that are deployed during network launch, set the environment variable `E2E_CONFIDENTIALITY` to `true` in the command line as follows: `E2E_CONFIDENTIALITY=true make start-interop` |
 
-For more information, refer to the associated [README](https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/fabric/dev).
+For more information, refer to the associated [README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/fabric/dev).
 
 **Troubleshooting Tips**:
 
@@ -135,7 +135,7 @@ Navigate to the `weaver/core/relay` folder and run a relay as follows:
   make convert-compose-method1
   ```
 
-For more information, see the [relay-docker README](https://github.com/hyperledger/cacti/tree/main/weaver/core/relay/relay-docker.md).
+For more information, see the [relay-docker README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/relay/relay-docker.md).
 
 ### Fabric Driver
 
diff --git a/docs/docs/weaver/getting-started/test-network/setup-packages.md b/docs/docs/weaver/getting-started/test-network/setup-packages.md
index e38f06f76b..8f1f79c0f3 100644
--- a/docs/docs/weaver/getting-started/test-network/setup-packages.md
+++ b/docs/docs/weaver/getting-started/test-network/setup-packages.md
@@ -98,7 +98,7 @@ Follow the instructions below to build and launch the networks:
 | If you do not wish to test Fabric-Fabric interoperation, you can choose to launch only one of the two networks along with its interoperation chaincode. For `network1`, run `make start-interop-network1`, and for `network2`, run `make start-interop-network2` |
 | If you wish to enable end-to-end confidentiality by default in the interoperation modules that are deployed during network launch, set the environment variable `E2E_CONFIDENTIALITY` to `true` in the command line as follows: `E2E_CONFIDENTIALITY=true make start-interop` |
 
-For more information, refer to the associated [README](https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/fabric/dev).
+For more information, refer to the associated [README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/fabric/dev).
 
 **Troubleshooting Tips**:
 
@@ -244,7 +244,7 @@ Run a relay for `network2` as follows (_do this only if you have launched both F
   RELAY_CONFIG=config/Fabric_Relay2.toml cargo run --bin server
   ```
 
-For more information, see the [relay README](https://github.com/hyperledger/cacti/tree/main/weaver/core/relay).
+For more information, see the [relay README](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/relay).
 
 
 ### Fabric Driver
diff --git a/docs/docs/weaver/publications.md b/docs/docs/weaver/publications.md
index d02649f2b9..6ff2bfc547 100644
--- a/docs/docs/weaver/publications.md
+++ b/docs/docs/weaver/publications.md
@@ -9,7 +9,7 @@ title: Publications
  SPDX-License-Identifier: CC-BY-4.0
  -->
 
-[Visit the repository](https://github.com/hyperledger/cacti/blob/main/weaver/OVERVIEW.md#articles) to find the current list of articles, talks, and research papers.
+[Visit the repository](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/OVERVIEW.md#articles) to find the current list of articles, talks, and research papers.
 
 ## 2021
 
diff --git a/docs/docs/weaver/specifications.md b/docs/docs/weaver/specifications.md
index f20fda8bd9..2be81380ca 100644
--- a/docs/docs/weaver/specifications.md
+++ b/docs/docs/weaver/specifications.md
@@ -9,6 +9,6 @@ title: Specifications
  SPDX-License-Identifier: CC-BY-4.0
  -->
 
-The Weaver specifications ([RFCs](https://github.com/hyperledger/cacti/tree/main/weaver/rfcs)) capture abstractions, models, protocols and data formats for enabling cross-ledger communication.
+The Weaver specifications ([RFCs](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/rfcs)) capture abstractions, models, protocols and data formats for enabling cross-ledger communication.
 
-For newcomers who wish to find out more details about the Weaver design and wish to contribute to the code base, we recommend starting with the [models](https://github.com/hyperledger/cacti/tree/main/weaver/rfcs/models). Protocol engineers will find in [RFC: 01-009](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/models/infrastructure/relays.md) a useful overview of the relay model, and may then progress on to reading one of the existing protocols' design and implementation; e.g., the data sharing protocol in [RFC: 02-001](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/protocols/data-sharing/generic.md). If you are interested in adding support for a new ledger technology, see the [existing driver implementations](https://github.com/hyperledger/cacti/tree/main/weaver/core/drivers) and [existing interoperability module implementations](https://github.com/hyperledger/cacti/tree/main/weaver/core/network). Where relevant we use [ABNF](https://tools.ietf.org/html/rfc5234) for formal syntax definitions.
+For newcomers who wish to find out more details about the Weaver design and wish to contribute to the code base, we recommend starting with the [models](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/rfcs/models). Protocol engineers will find in [RFC: 01-009](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/models/infrastructure/relays.md) a useful overview of the relay model, and may then progress on to reading one of the existing protocols' design and implementation; e.g., the data sharing protocol in [RFC: 02-001](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/protocols/data-sharing/generic.md). If you are interested in adding support for a new ledger technology, see the [existing driver implementations](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/drivers) and [existing interoperability module implementations](https://github.com/hyperledger-cacti/cacti/tree/main/weaver/core/network). Where relevant we use [ABNF](https://tools.ietf.org/html/rfc5234) for formal syntax definitions.
diff --git a/examples/cactus-common-example-server/package.json b/examples/cactus-common-example-server/package.json
index 41cca27b5e..f6b1927a9e 100644
--- a/examples/cactus-common-example-server/package.json
+++ b/examples/cactus-common-example-server/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-example-carbon-accounting-backend/package.json b/examples/cactus-example-carbon-accounting-backend/package.json
index 6c5374f443..74c3c19d3d 100644
--- a/examples/cactus-example-carbon-accounting-backend/package.json
+++ b/examples/cactus-example-carbon-accounting-backend/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json b/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json
index 6f0237a098..0088856f2f 100644
--- a/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json
+++ b/examples/cactus-example-carbon-accounting-business-logic-plugin/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-example-carbon-accounting-frontend/package.json b/examples/cactus-example-carbon-accounting-frontend/package.json
index 888c990d33..49c1996812 100644
--- a/examples/cactus-example-carbon-accounting-frontend/package.json
+++ b/examples/cactus-example-carbon-accounting-frontend/package.json
@@ -10,7 +10,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-example-cbdc-bridging-backend/package.json b/examples/cactus-example-cbdc-bridging-backend/package.json
index 3c99e06b1d..c596345c51 100644
--- a/examples/cactus-example-cbdc-bridging-backend/package.json
+++ b/examples/cactus-example-cbdc-bridging-backend/package.json
@@ -13,7 +13,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-example-discounted-asset-trade-client/package.json b/examples/cactus-example-discounted-asset-trade-client/package.json
index e20eb5d0f9..a825235942 100644
--- a/examples/cactus-example-discounted-asset-trade-client/package.json
+++ b/examples/cactus-example-discounted-asset-trade-client/package.json
@@ -12,7 +12,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-example-supply-chain-backend/package.json b/examples/cactus-example-supply-chain-backend/package.json
index 86b22902e3..bc1e092c9a 100644
--- a/examples/cactus-example-supply-chain-backend/package.json
+++ b/examples/cactus-example-supply-chain-backend/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-example-supply-chain-business-logic-plugin/package.json b/examples/cactus-example-supply-chain-business-logic-plugin/package.json
index 48e533e8d5..2e5ca98349 100644
--- a/examples/cactus-example-supply-chain-business-logic-plugin/package.json
+++ b/examples/cactus-example-supply-chain-business-logic-plugin/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-example-supply-chain-frontend/package.json b/examples/cactus-example-supply-chain-frontend/package.json
index 3d7b02b385..c82b23638a 100644
--- a/examples/cactus-example-supply-chain-frontend/package.json
+++ b/examples/cactus-example-supply-chain-frontend/package.json
@@ -10,7 +10,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/examples/cactus-workshop-examples-2022-11-14/package.json b/examples/cactus-workshop-examples-2022-11-14/package.json
index adff3e3b92..8087926b53 100644
--- a/examples/cactus-workshop-examples-2022-11-14/package.json
+++ b/examples/cactus-workshop-examples-2022-11-14/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/cactus-plugin-htlc-coordinator-besu/package.json b/extensions/cactus-plugin-htlc-coordinator-besu/package.json
index df61efef5f..322f0c27a8 100644
--- a/extensions/cactus-plugin-htlc-coordinator-besu/package.json
+++ b/extensions/cactus-plugin-htlc-coordinator-besu/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/extensions/cactus-plugin-object-store-ipfs/package.json b/extensions/cactus-plugin-object-store-ipfs/package.json
index d008c8f907..788fce2fb7 100644
--- a/extensions/cactus-plugin-object-store-ipfs/package.json
+++ b/extensions/cactus-plugin-object-store-ipfs/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cacti-ledger-browser/package.json b/packages/cacti-ledger-browser/package.json
index 9a1f6c40aa..9f2cdf2fd1 100644
--- a/packages/cacti-ledger-browser/package.json
+++ b/packages/cacti-ledger-browser/package.json
@@ -12,7 +12,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cacti-plugin-consortium-static/package.json b/packages/cacti-plugin-consortium-static/package.json
index 5f9efd46c1..c17e4b942b 100644
--- a/packages/cacti-plugin-consortium-static/package.json
+++ b/packages/cacti-plugin-consortium-static/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cacti-plugin-ledger-connector-stellar/package.json b/packages/cacti-plugin-ledger-connector-stellar/package.json
index 836aceddd7..76969e7084 100644
--- a/packages/cacti-plugin-ledger-connector-stellar/package.json
+++ b/packages/cacti-plugin-ledger-connector-stellar/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cacti-plugin-weaver-driver-fabric/package.json b/packages/cacti-plugin-weaver-driver-fabric/package.json
index c50f378a74..d1e05a39c2 100644
--- a/packages/cacti-plugin-weaver-driver-fabric/package.json
+++ b/packages/cacti-plugin-weaver-driver-fabric/package.json
@@ -12,7 +12,7 @@
     ],
     "homepage": "https://github.com/hyperledger/cacti#readme",
     "bugs": {
-        "url": "https://github.com/hyperledger/cacti/issues"
+        "url": "https://github.com/hyperledger-cacti/cacti/issues"
     },
     "repository": {
         "type": "git",
diff --git a/packages/cacti-plugin-weaver-driver-fabric/readme.md b/packages/cacti-plugin-weaver-driver-fabric/readme.md
index 7a504e1aad..59375fa6db 100644
--- a/packages/cacti-plugin-weaver-driver-fabric/readme.md
+++ b/packages/cacti-plugin-weaver-driver-fabric/readme.md
@@ -10,6 +10,6 @@ There are some distinctive features of the Weaver Fabric driver that are not cov
 
 For detailed information about fabric driver visit [here](src/main/typescript/readme.md).
 
-To use fabric-driver in your application please refer [documentation](https://hyperledger.github.io/cacti/weaver/getting-started/guide/). 
+To use fabric-driver in your application please refer [documentation](https://hyperledger-cacti.github.io/cacti/weaver/getting-started/guide/). 
 
 
diff --git a/packages/cactus-api-client/package.json b/packages/cactus-api-client/package.json
index 1eba6d0615..7fb2aef034 100644
--- a/packages/cactus-api-client/package.json
+++ b/packages/cactus-api-client/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-cmd-api-server/package.json b/packages/cactus-cmd-api-server/package.json
index 3a00b12135..f09bb30fb9 100644
--- a/packages/cactus-cmd-api-server/package.json
+++ b/packages/cactus-cmd-api-server/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-common/package.json b/packages/cactus-common/package.json
index 80378f7366..4fca562d91 100644
--- a/packages/cactus-common/package.json
+++ b/packages/cactus-common/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-core-api/package.json b/packages/cactus-core-api/package.json
index 05126ed02e..78ba79bd7e 100644
--- a/packages/cactus-core-api/package.json
+++ b/packages/cactus-core-api/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-core/package.json b/packages/cactus-core/package.json
index cc1f52a2db..5224b9a85b 100644
--- a/packages/cactus-core/package.json
+++ b/packages/cactus-core/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-consortium-manual/package.json b/packages/cactus-plugin-consortium-manual/package.json
index 19595fd689..7c61150d06 100644
--- a/packages/cactus-plugin-consortium-manual/package.json
+++ b/packages/cactus-plugin-consortium-manual/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-htlc-eth-besu-erc20/package.json b/packages/cactus-plugin-htlc-eth-besu-erc20/package.json
index 1f52933f18..50997d2277 100644
--- a/packages/cactus-plugin-htlc-eth-besu-erc20/package.json
+++ b/packages/cactus-plugin-htlc-eth-besu-erc20/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-htlc-eth-besu/package.json b/packages/cactus-plugin-htlc-eth-besu/package.json
index 1aea82e7ef..5b6af2a38c 100644
--- a/packages/cactus-plugin-htlc-eth-besu/package.json
+++ b/packages/cactus-plugin-htlc-eth-besu/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-keychain-aws-sm/package.json b/packages/cactus-plugin-keychain-aws-sm/package.json
index 653ef4c6a7..887ec553ef 100644
--- a/packages/cactus-plugin-keychain-aws-sm/package.json
+++ b/packages/cactus-plugin-keychain-aws-sm/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-keychain-azure-kv/package.json b/packages/cactus-plugin-keychain-azure-kv/package.json
index 249b79f93d..9688020209 100644
--- a/packages/cactus-plugin-keychain-azure-kv/package.json
+++ b/packages/cactus-plugin-keychain-azure-kv/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-keychain-google-sm/package.json b/packages/cactus-plugin-keychain-google-sm/package.json
index f5b029e78f..a3b6ce60ff 100644
--- a/packages/cactus-plugin-keychain-google-sm/package.json
+++ b/packages/cactus-plugin-keychain-google-sm/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-keychain-memory-wasm/package.json b/packages/cactus-plugin-keychain-memory-wasm/package.json
index 5a7f96cc1a..ec4315cc01 100644
--- a/packages/cactus-plugin-keychain-memory-wasm/package.json
+++ b/packages/cactus-plugin-keychain-memory-wasm/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-keychain-memory/package.json b/packages/cactus-plugin-keychain-memory/package.json
index c654c5439a..c57bcef77b 100644
--- a/packages/cactus-plugin-keychain-memory/package.json
+++ b/packages/cactus-plugin-keychain-memory/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-keychain-vault/package.json b/packages/cactus-plugin-keychain-vault/package.json
index 5e9e98d282..2d9ce28032 100644
--- a/packages/cactus-plugin-keychain-vault/package.json
+++ b/packages/cactus-plugin-keychain-vault/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-aries/package.json b/packages/cactus-plugin-ledger-connector-aries/package.json
index 1065a0794f..d9718c1b03 100644
--- a/packages/cactus-plugin-ledger-connector-aries/package.json
+++ b/packages/cactus-plugin-ledger-connector-aries/package.json
@@ -12,7 +12,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-besu/package.json b/packages/cactus-plugin-ledger-connector-besu/package.json
index d766db2898..60f2d5d847 100644
--- a/packages/cactus-plugin-ledger-connector-besu/package.json
+++ b/packages/cactus-plugin-ledger-connector-besu/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-cdl/package.json b/packages/cactus-plugin-ledger-connector-cdl/package.json
index debd39e998..244318ff7e 100644
--- a/packages/cactus-plugin-ledger-connector-cdl/package.json
+++ b/packages/cactus-plugin-ledger-connector-cdl/package.json
@@ -12,7 +12,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-corda/package.json b/packages/cactus-plugin-ledger-connector-corda/package.json
index 8c3a549f0d..9388a6e350 100644
--- a/packages/cactus-plugin-ledger-connector-corda/package.json
+++ b/packages/cactus-plugin-ledger-connector-corda/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-ethereum/package.json b/packages/cactus-plugin-ledger-connector-ethereum/package.json
index 4076df37db..38546e7d0b 100644
--- a/packages/cactus-plugin-ledger-connector-ethereum/package.json
+++ b/packages/cactus-plugin-ledger-connector-ethereum/package.json
@@ -12,7 +12,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-fabric/package.json b/packages/cactus-plugin-ledger-connector-fabric/package.json
index 3dafae2890..ce0f387942 100644
--- a/packages/cactus-plugin-ledger-connector-fabric/package.json
+++ b/packages/cactus-plugin-ledger-connector-fabric/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-iroha2/package.json b/packages/cactus-plugin-ledger-connector-iroha2/package.json
index b32460bfb3..8417f675d7 100644
--- a/packages/cactus-plugin-ledger-connector-iroha2/package.json
+++ b/packages/cactus-plugin-ledger-connector-iroha2/package.json
@@ -14,7 +14,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-polkadot/package.json b/packages/cactus-plugin-ledger-connector-polkadot/package.json
index 3de7cdc73a..ff1cfa0f36 100644
--- a/packages/cactus-plugin-ledger-connector-polkadot/package.json
+++ b/packages/cactus-plugin-ledger-connector-polkadot/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-sawtooth/package.json b/packages/cactus-plugin-ledger-connector-sawtooth/package.json
index 951f3e8a92..7f5ee6bcfd 100644
--- a/packages/cactus-plugin-ledger-connector-sawtooth/package.json
+++ b/packages/cactus-plugin-ledger-connector-sawtooth/package.json
@@ -12,7 +12,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-ledger-connector-xdai/package.json b/packages/cactus-plugin-ledger-connector-xdai/package.json
index e1e9de5a01..747a237e6d 100644
--- a/packages/cactus-plugin-ledger-connector-xdai/package.json
+++ b/packages/cactus-plugin-ledger-connector-xdai/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-persistence-ethereum/package.json b/packages/cactus-plugin-persistence-ethereum/package.json
index 13e47f7de2..a3d26e63e2 100644
--- a/packages/cactus-plugin-persistence-ethereum/package.json
+++ b/packages/cactus-plugin-persistence-ethereum/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-plugin-persistence-fabric/package.json b/packages/cactus-plugin-persistence-fabric/package.json
index c889f72be1..e7277cd907 100644
--- a/packages/cactus-plugin-persistence-fabric/package.json
+++ b/packages/cactus-plugin-persistence-fabric/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-test-api-client/package.json b/packages/cactus-test-api-client/package.json
index d09e4b3917..690a22ef08 100644
--- a/packages/cactus-test-api-client/package.json
+++ b/packages/cactus-test-api-client/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-test-cmd-api-server/package.json b/packages/cactus-test-cmd-api-server/package.json
index 409226c308..8ca67b784a 100644
--- a/packages/cactus-test-cmd-api-server/package.json
+++ b/packages/cactus-test-cmd-api-server/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-test-plugin-consortium-manual/package.json b/packages/cactus-test-plugin-consortium-manual/package.json
index 01598a61e2..7eeee5a789 100644
--- a/packages/cactus-test-plugin-consortium-manual/package.json
+++ b/packages/cactus-test-plugin-consortium-manual/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-test-plugin-htlc-eth-besu-erc20/package.json b/packages/cactus-test-plugin-htlc-eth-besu-erc20/package.json
index 4f5008f56d..4b789b4c1e 100644
--- a/packages/cactus-test-plugin-htlc-eth-besu-erc20/package.json
+++ b/packages/cactus-test-plugin-htlc-eth-besu-erc20/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-test-plugin-htlc-eth-besu/package.json b/packages/cactus-test-plugin-htlc-eth-besu/package.json
index 237aada917..293841f228 100644
--- a/packages/cactus-test-plugin-htlc-eth-besu/package.json
+++ b/packages/cactus-test-plugin-htlc-eth-besu/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-test-plugin-keychain-memory/package.json b/packages/cactus-test-plugin-keychain-memory/package.json
index 66b404d293..ca5cec2fca 100644
--- a/packages/cactus-test-plugin-keychain-memory/package.json
+++ b/packages/cactus-test-plugin-keychain-memory/package.json
@@ -12,7 +12,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-test-plugin-ledger-connector-besu/package.json b/packages/cactus-test-plugin-ledger-connector-besu/package.json
index 21995a6ea6..9dd2778bee 100644
--- a/packages/cactus-test-plugin-ledger-connector-besu/package.json
+++ b/packages/cactus-test-plugin-ledger-connector-besu/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/packages/cactus-test-plugin-ledger-connector-ethereum/package.json b/packages/cactus-test-plugin-ledger-connector-ethereum/package.json
index ac9cce4582..d975599b7b 100644
--- a/packages/cactus-test-plugin-ledger-connector-ethereum/package.json
+++ b/packages/cactus-test-plugin-ledger-connector-ethereum/package.json
@@ -11,7 +11,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
diff --git a/tools/pr-commit-parity.js b/tools/pr-commit-parity.js
index a6b6252019..3706bcfefc 100644
--- a/tools/pr-commit-parity.js
+++ b/tools/pr-commit-parity.js
@@ -136,8 +136,8 @@ for (let commitMessageListIndex in commitMessageList) {
 if (!PR_COMMIT_PARITY) {
   console.error(
     "PR message and commit message are not similar. A general solution for this is to have PR message exactly same as the commit message\n" +
-      "Please refer the following PR for reference: https://github.com/hyperledger/cacti/pull/3338\n" +
-      "And the commit message here: https://github.com/hyperledger/cacti/pull/3338/commits/47ebdec442d30fa48c8518b876c47c38097cf028\n",
+      "Please refer the following PR for reference: https://github.com/hyperledger-cacti/cacti/pull/3338\n" +
+      "And the commit message here: https://github.com/hyperledger-cacti/cacti/pull/3338/commits/47ebdec442d30fa48c8518b876c47c38097cf028\n",
     "-----------------------------------------------\n\n",
     "Commit Message List (ignore extra white spaces and new lines)\n" +
       commitMessageList +
diff --git a/tools/sync-npm-deps-to-tsc-projects.ts b/tools/sync-npm-deps-to-tsc-projects.ts
index 69a8e13413..095f118027 100644
--- a/tools/sync-npm-deps-to-tsc-projects.ts
+++ b/tools/sync-npm-deps-to-tsc-projects.ts
@@ -45,7 +45,7 @@ const main = async (argv: string[], env: NodeJS.ProcessEnv) => {
       "**/weaver/common/protos-js/**",
       "**/weaver/samples/besu/simpleasset/**",
       "**/weaver/samples/besu/simplestate/**",
-    ], // Follow-up issue regarding these hardcoded paths (https://github.com/hyperledger/cacti/issues/3366)
+    ], // Follow-up issue regarding these hardcoded paths (https://github.com/hyperledger-cacti/cacti/issues/3366)
   };
   const pkgJsonPaths = await globby(pkgJsonGlobPatterns, globbyOptions);
   console.log(`Package paths (${pkgJsonPaths.length}): `, pkgJsonPaths);
diff --git a/weaver/OVERVIEW.md b/weaver/OVERVIEW.md
index 3c57eeaffe..abdfabc4ee 100644
--- a/weaver/OVERVIEW.md
+++ b/weaver/OVERVIEW.md
@@ -26,9 +26,9 @@ Toward the right of the figure, you can see functions in the semantic layer call
 - Asset transfer
 - Asset exchange
 
-You can find details on these use cases (or _modes_ of interoperation) in [Interoperability Modes](https://hyperledger.github.io/cacti/weaver/interoperability-modes/).
+You can find details on these use cases (or _modes_ of interoperation) in [Interoperability Modes](https://hyperledger-cacti.github.io/cacti/weaver/interoperability-modes/).
 
-_Relay_ modules owned and managed by networks enable cross-network communications or even communications between networks and enterprises systems of record. Cross-network identity management occurs on a separate plane from the information exchanges, and our vision for this is described in [Decentralized Identity](https://hyperledger.github.io/cacti/weaver/architecture-and-design/decentralized-identity/) and [Distributed Identity Management for Interoperation](./rfcs/models/identity/network-identity-management.md).
+_Relay_ modules owned and managed by networks enable cross-network communications or even communications between networks and enterprises systems of record. Cross-network identity management occurs on a separate plane from the information exchanges, and our vision for this is described in [Decentralized Identity](https://hyperledger-cacti.github.io/cacti/weaver/architecture-and-design/decentralized-identity/) and [Distributed Identity Management for Interoperation](./rfcs/models/identity/network-identity-management.md).
 
 ## System Design and Deployment
 
diff --git a/weaver/README.md b/weaver/README.md
index dedf6fbd49..e06a5fa47a 100644
--- a/weaver/README.md
+++ b/weaver/README.md
@@ -7,8 +7,8 @@
 
 <div align="center">
 
-[![Data Sharing Status](https://github.com/hyperledger/cacti/actions/workflows/test_data-sharing.yml/badge.svg?event=push)](https://github.com/hyperledger/cacti/actions/workflows/test_data-sharing.yml) [![Asset Transfer Status](https://github.com/hyperledger/cacti/actions/workflows/test_asset-transfer.yml/badge.svg?event=push)](https://github.com/hyperledger/cacti/actions/workflows/test_asset-transfer.yml)  
-[![Fabric Asset Exchange Status](https://github.com/hyperledger/cacti/actions/workflows/test_asset-exchange-fabric.yml/badge.svg?event=push)](https://github.com/hyperledger/cacti/actions/workflows/test_asset-exchange-fabric.yml) [![Corda Asset Exchange Status](https://github.com/hyperledger/cacti/actions/workflows/test_asset-exchange-corda.yml/badge.svg?event=push)](https://github.com/hyperledger/cacti/actions/workflows/test_asset-exchange-corda.yml) [![Besu Asset Exchange Status](https://github.com/hyperledger/cacti/actions/workflows/test_asset-exchange-besu.yml/badge.svg?event=push)](https://github.com/hyperledger/cacti/actions/workflows/test_asset-exchange-besu.yml)
+[![Data Sharing Status](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_data-sharing.yml/badge.svg?event=push)](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_data-sharing.yml) [![Asset Transfer Status](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_asset-transfer.yml/badge.svg?event=push)](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_asset-transfer.yml)  
+[![Fabric Asset Exchange Status](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_asset-exchange-fabric.yml/badge.svg?event=push)](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_asset-exchange-fabric.yml) [![Corda Asset Exchange Status](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_asset-exchange-corda.yml/badge.svg?event=push)](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_asset-exchange-corda.yml) [![Besu Asset Exchange Status](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_asset-exchange-besu.yml/badge.svg?event=push)](https://github.com/hyperledger-cacti/cacti/actions/workflows/test_asset-exchange-besu.yml)
 
 </div>
 
@@ -51,8 +51,8 @@ For more details and illustrations, see the [project overview](./OVERVIEW.md).
 Weaver can be used to link business workflows (implemented as smart contracts or decentralized applications) spanning multiple independent permissioned ledgers, in effect scaling up the reach and impact of those processes without sacrificing decentralized operation and network sovereignty.
 
 Two popular categories of enterprise applications in which blockchain or distributed ledger technology play a major role today and which need interoperability support of the kind Weaver offers are:
-- [Global Trade](https://hyperledger.github.io/cacti/weaver/user-stories/global-trade/)
-- [Financial Markets](https://hyperledger.github.io/cacti/weaver/user-stories/financial-markets/)
+- [Global Trade](https://hyperledger-cacti.github.io/cacti/weaver/user-stories/global-trade/)
+- [Financial Markets](https://hyperledger-cacti.github.io/cacti/weaver/user-stories/financial-markets/)
 
 ## Weaver Support Status
 The table below shows what interoperation capabilities (or use cases) are presently supported by Weaver, and what DLTs the platform offers out-of-the-box components for.
@@ -66,8 +66,8 @@ Prominent features in our future roadmap are:
 - Support the use cases of cross-network transaction invocations (i.e., instructions) and event dissemination (publish/subscribe).
 
 ## Documentation
-- Blockchain practitioners who wish to understand what Weaver offers, use Weaver capabilities, or experiment with the code, should check the [Documentation](https://hyperledger.github.io/cacti/weaver/introduction/).
-- To dive straight into running a basic setup and testing sample interoperation scenarios, start with the [Getting Started guide](https://hyperledger.github.io/cacti/weaver/getting-started/guide/).
+- Blockchain practitioners who wish to understand what Weaver offers, use Weaver capabilities, or experiment with the code, should check the [Documentation](https://hyperledger-cacti.github.io/cacti/weaver/introduction/).
+- To dive straight into running a basic setup and testing sample interoperation scenarios, start with the [Getting Started guide](https://hyperledger-cacti.github.io/cacti/weaver/getting-started/guide/).
 
 ## Repository Structure
 - Comprehensive specifications of our architecture and protocol suite are written in the style of RFCs and found in the [rfcs folder](./rfcs).
diff --git a/weaver/common/protos-js/package.json b/weaver/common/protos-js/package.json
index 623fa3738b..ee72d295fe 100644
--- a/weaver/common/protos-js/package.json
+++ b/weaver/common/protos-js/package.json
@@ -13,7 +13,7 @@
   ],
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "repository": {
     "type": "git",
@@ -56,7 +56,7 @@
   "licenses": [
     {
       "type": "Apache-2.0",
-      "url": "https://github.com/hyperledger/cacti/blob/main/weaver/LICENSE"
+      "url": "https://github.com/hyperledger-cacti/cacti/blob/main/weaver/LICENSE"
     }
   ]
 }
diff --git a/weaver/common/protos-rs/pkg/Cargo.toml b/weaver/common/protos-rs/pkg/Cargo.toml
index 7278ba7bba..aca9560258 100644
--- a/weaver/common/protos-rs/pkg/Cargo.toml
+++ b/weaver/common/protos-rs/pkg/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["Peter Somogyvari  <peter.somogyvari@accenture.com>", "Sandeep Nishad
 edition = "2021"
 license = "Apache-2.0"
 description = "Rust compiled Weaver protobuf package"
-documentation = "https://github.com/hyperledger/cacti/tree/main/weaver/rfcs/formats"
-repository = "https://github.com/hyperledger/cacti/"
+documentation = "https://github.com/hyperledger-cacti/cacti/tree/main/weaver/rfcs/formats"
+repository = "https://github.com/hyperledger-cacti/cacti/"
 readme = "README.md"
 keywords = ["cacti", "weaver", "interoperability", "protobuf", "protos"]
 
diff --git a/weaver/common/protos/besu/view_data.proto b/weaver/common/protos/besu/view_data.proto
index e98a24a34f..9f47c8e9d0 100644
--- a/weaver/common/protos/besu/view_data.proto
+++ b/weaver/common/protos/besu/view_data.proto
@@ -11,7 +11,7 @@ option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/bes
 
 
 // link below will take you to besu view rfc 
-// https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/views/besu.md
+// https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/views/besu.md
 //
 // take a view at BlockHeader in Besu
 // https://github.com/hyperledger/besu/blob/21.7.0/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeader.java#L199
diff --git a/weaver/core/drivers/corda-driver/README.md b/weaver/core/drivers/corda-driver/README.md
index 4438c895ba..044ec68b40 100644
--- a/weaver/core/drivers/corda-driver/README.md
+++ b/weaver/core/drivers/corda-driver/README.md
@@ -120,7 +120,7 @@ To push image to github container registry:
     - `DRIVER_RPC_PASSWORD`: Password for the above RPC user.
     - `EXTERNAL_NETWORK`: Name of the docker network in which the Corda containers are deployed.
     - `DOCKER_IMAGE_NAME`: _Keep this unchanged_.
-    - `DOCKER_TAG`: Refer here for the image tags available: [cacti-weaver-driver-corda](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-driver-corda)
+    - `DOCKER_TAG`: Refer here for the image tags available: [cacti-weaver-driver-corda](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-driver-corda)
     - `COMPOSE_PROJECT_NAME`: Docker project name for the Corda network to which this driver is supposed to attach. By default, the folder name of the Corda network's `docker-compose.yml`, is the project name.
     - `COMPOSE_PROJECT_NETWORK`: Docker project network name for the Corda network to which this driver is supposed to attach. By default, `default` is the project network name.
     - `RELAY_TLS`: Boolean flag indicating whether or not the local relay requires TLS connections
diff --git a/weaver/core/drivers/corda-driver/makefile b/weaver/core/drivers/corda-driver/makefile
index c44ae125d0..edcb6c62d6 100644
--- a/weaver/core/drivers/corda-driver/makefile
+++ b/weaver/core/drivers/corda-driver/makefile
@@ -1,7 +1,7 @@
 DOCKER_IMAGE_NAME ?= cacti-weaver-driver-corda
 DOCKER_TAG ?= `cat ./VERSION`
 DOCKER_REGISTRY ?= ghcr.io/hyperledger
-GIT_URL = https://github.com/hyperledger/cacti/weaver/core/drivers/corda-driver
+GIT_URL = https://github.com/hyperledger-cacti/cacti/weaver/core/drivers/corda-driver
 
 COMPOSE_ARG ?=
 
diff --git a/weaver/core/drivers/fabric-driver/makefile b/weaver/core/drivers/fabric-driver/makefile
index ace5a38d31..14ff470d77 100644
--- a/weaver/core/drivers/fabric-driver/makefile
+++ b/weaver/core/drivers/fabric-driver/makefile
@@ -1,7 +1,7 @@
 DOCKER_IMAGE_NAME ?= cacti-weaver-driver-fabric
 DOCKER_TAG ?= `cat ./VERSION`
 DOCKER_REGISTRY ?= ghcr.io/hyperledger
-GIT_URL = https://github.com/hyperledger/cacti/cacti/core/drivers/fabric-driver
+GIT_URL = https://github.com/hyperledger-cacti/cacti/cacti/core/drivers/fabric-driver
 NETWORK_NAME ?= network1
 COMPOSE_ARG ?=
 
diff --git a/weaver/core/drivers/fabric-driver/readme.md b/weaver/core/drivers/fabric-driver/readme.md
index 8759691183..26a68d106b 100644
--- a/weaver/core/drivers/fabric-driver/readme.md
+++ b/weaver/core/drivers/fabric-driver/readme.md
@@ -65,7 +65,7 @@ To deploy, run `make deploy`
 
 * Create a Personal Access Token with read packages access in github. Refer [Creating a Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) for help.
 * Run `docker login ghcr.io` and use your github username and personal access token as password.
-* Copy `.env.docker.template` to `.env` and make changes appropriately (like correcting the base path of repo, changing network name if required etc, check image details here: [cacti-weaver-fabric-driver](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-fabric-driver)).
+* Copy `.env.docker.template` to `.env` and make changes appropriately (like correcting the base path of repo, changing network name if required etc, check image details here: [cacti-weaver-fabric-driver](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-fabric-driver)).
 * Make sure connection profile used for docker, containers correct hostnames instead of localhost in urls.
 * If deploying more than one driver on same host, make sure to change service name in docker compose to avoid conflicts.
 * Finally run `docker compose up -d` to deploy the fabric driver.
@@ -101,7 +101,7 @@ NOTE: When specifying ensure that they match the config that the relay is using.
 
 **For docker-compose:***
 
-* `DOCKER_IMAGE_NAME`, and `DOCKER_TAG` needs to specified based on [cacti-weaver-fabric-driver](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-fabric-driver) image.
+* `DOCKER_IMAGE_NAME`, and `DOCKER_TAG` needs to specified based on [cacti-weaver-fabric-driver](https://github.com/hyperledger-cacti/cacti/pkgs/container/cacti-weaver-fabric-driver) image.
 * `DRIVER_PORT` is the driver server port.
 * `EXTERNAL_NETWORK` is the docker network in which fabric-network is running.
 
diff --git a/weaver/core/identity-management/README.md b/weaver/core/identity-management/README.md
index 0bf41f1e71..0304497eee 100644
--- a/weaver/core/identity-management/README.md
+++ b/weaver/core/identity-management/README.md
@@ -5,7 +5,7 @@
  -->
 # Cross-Network Identity Management
 
-Enabling two independent networks/ledgers to interoperate requires the establishment of trust on the basis of the identities of the main participants (stakeholders) of each network. The cross-network identity management required for this trust establishment must itself be as decentralized as possible and adhere to blockchain/DLT tenets. In this folder, we implement the cross-network architecture described in the [Weaver identity RFCs](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/models/identity/network-identity-management.md).
+Enabling two independent networks/ledgers to interoperate requires the establishment of trust on the basis of the identities of the main participants (stakeholders) of each network. The cross-network identity management required for this trust establishment must itself be as decentralized as possible and adhere to blockchain/DLT tenets. In this folder, we implement the cross-network architecture described in the [Weaver identity RFCs](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/models/identity/network-identity-management.md).
 
 The fulcra of this architecture that are external to the interoperating networks are the IINs, or Interoperable Identity Networks (an adaptation of a generic distributed identity registry). Though our specifications allow integration with any form of distributed identity registry (with some augmentations), we provide in the [iin](./iin) folder a reference implementation of an ideal IIN.
 
diff --git a/weaver/core/identity-management/iin-agent/README.md b/weaver/core/identity-management/iin-agent/README.md
index c0cf9fe4a7..a4fca3991b 100644
--- a/weaver/core/identity-management/iin-agent/README.md
+++ b/weaver/core/identity-management/iin-agent/README.md
@@ -5,7 +5,7 @@
  -->
 # IIN Agent Implementation
 
-In this folder lies an implementation of the IIN agent according to the [RFC specification](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/models/identity/iin-agent.md).
+In this folder lies an implementation of the IIN agent according to the [RFC specification](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/models/identity/iin-agent.md).
 
 The core part of this module is built in a DLT-neutral manner and can be used by a participant of a network running on any DLT platform. The module also has extensions that can be activated for specific DLT platforms.
 
diff --git a/weaver/core/identity-management/iin-agent/makefile b/weaver/core/identity-management/iin-agent/makefile
index 586880ca25..c2f261ec93 100644
--- a/weaver/core/identity-management/iin-agent/makefile
+++ b/weaver/core/identity-management/iin-agent/makefile
@@ -1,7 +1,7 @@
 DOCKER_IMAGE_NAME ?= cacti-weaver-iin-agent
 DOCKER_TAG ?= `cat ./VERSION`
 DOCKER_REGISTRY ?= ghcr.io/hyperledger
-GIT_URL = https://github.com/hyperledger/cacti/weaver/core/identity-management/iin-agent
+GIT_URL = https://github.com/hyperledger-cacti/cacti/weaver/core/identity-management/iin-agent
 DLT_SPECIFIC_DIR ?= .
 COMPOSE_ARG ?=
 
diff --git a/weaver/core/identity-management/iin/README.md b/weaver/core/identity-management/iin/README.md
index 2fe2b5e38a..fe74191248 100644
--- a/weaver/core/identity-management/iin/README.md
+++ b/weaver/core/identity-management/iin/README.md
@@ -5,6 +5,6 @@
  -->
 # Interoperation Identity Network Reference Implementation
 
-In this folder lies a reference implementation of an IIN according to the [RFC specification](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/models/identity/iin.md). This sample IIN is built on Hyperledger Indy, which offers a feature set closest to what is required by a Weaver IIN. (_Note_: Weaver does not mandate the use of Indy, and may provide reference implementations of IINs on other platforms in the future.)
+In this folder lies a reference implementation of an IIN according to the [RFC specification](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/models/identity/iin.md). This sample IIN is built on Hyperledger Indy, which offers a feature set closest to what is required by a Weaver IIN. (_Note_: Weaver does not mandate the use of Indy, and may provide reference implementations of IINs on other platforms in the future.)
 
 _This is currently a placeholder._
diff --git a/weaver/core/identity-management/trust-anchor/README.md b/weaver/core/identity-management/trust-anchor/README.md
index 046c673b74..707190a1e4 100644
--- a/weaver/core/identity-management/trust-anchor/README.md
+++ b/weaver/core/identity-management/trust-anchor/README.md
@@ -5,6 +5,6 @@
  -->
 # IIN Trust Anchor Reference Implementation
 
-In this folder lies a reference implementation of an IIN trust anchor according to the [RFC specification](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/models/identity/iin.md#trust-anchors).
+In this folder lies a reference implementation of an IIN trust anchor according to the [RFC specification](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/models/identity/iin.md#trust-anchors).
 
 _This is currently a placeholder._
diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md b/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md
index fd12f3df32..aed15dfaa6 100644
--- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md
+++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md
@@ -38,8 +38,8 @@ Atleast following 5 functions needs to be added in chaincode (Note: the function
       return contractId, nil
   }
   ```
-  Here `assetExchangeAgreementSerializedProto64` is serialized protobuf in base64 encoded string of `AssetExchangeAgreement` protobuf structure, and can be used to extract details like asset id, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements). 
-  Similarly `lockInfoSerializedProto64` is serialized protobuf in base64 encoded string of `AssetLock` protobuf structure. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-locks-on-assets).
+  Here `assetExchangeAgreementSerializedProto64` is serialized protobuf in base64 encoded string of `AssetExchangeAgreement` protobuf structure, and can be used to extract details like asset id, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements). 
+  Similarly `lockInfoSerializedProto64` is serialized protobuf in base64 encoded string of `AssetLock` protobuf structure. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-locks-on-assets).
   
 2. **LockFungibleAsset**
   ```go
@@ -55,7 +55,7 @@ Atleast following 5 functions needs to be added in chaincode (Note: the function
       return contractId, nil
   }
   ```
-  Here `fungibleAssetExchangeAgreementSerializedProto64` is serialized protobuf in base64 encoded string of `FungibleAssetExchangeAgreement` protobuf structure, and can be used to extract details like asset quantity, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
+  Here `fungibleAssetExchangeAgreementSerializedProto64` is serialized protobuf in base64 encoded string of `FungibleAssetExchangeAgreement` protobuf structure, and can be used to extract details like asset quantity, type of asset and recipient. Check the structure definition [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/rfcs/formats/assets/exchange.md#representing-two-party-asset-exchange-agreements).
   
 3. **IsAssetLockedQueryUsingContractId**
   ```go
diff --git a/weaver/core/network/fabric-interop-cc/makefile b/weaver/core/network/fabric-interop-cc/makefile
index 9a754919bd..eb9307f74c 100644
--- a/weaver/core/network/fabric-interop-cc/makefile
+++ b/weaver/core/network/fabric-interop-cc/makefile
@@ -1,7 +1,7 @@
 DOCKER_IMAGE_NAME ?= cacti-weaver-imodule-fabric
 DOCKER_TAG ?= `cat contracts/interop/VERSION`
 DOCKER_REGISTRY ?= ghcr.io/hyperledger
-GIT_URL = https://github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc
+GIT_URL = https://github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc
 
 .PHONY: build protos all clean image push-image check-if-tag-exists
 
diff --git a/weaver/core/relay/Makefile b/weaver/core/relay/Makefile
index b79dea8e54..e80c933443 100644
--- a/weaver/core/relay/Makefile
+++ b/weaver/core/relay/Makefile
@@ -1,7 +1,7 @@
 DOCKER_IMAGE_NAME ?= cacti-weaver-relay
 DOCKER_TAG ?= `cat ./VERSION`
 DOCKER_REGISTRY ?= ghcr.io/hyperledger
-GIT_URL = https://github.com/hyperledger/cacti/weaver
+GIT_URL = https://github.com/hyperledger-cacti/cacti/weaver
 
 PROTOS_TAG ?= v1.4.2
 
diff --git a/weaver/core/relay/docs/README.md b/weaver/core/relay/docs/README.md
index 5965326478..de4e87dd05 100644
--- a/weaver/core/relay/docs/README.md
+++ b/weaver/core/relay/docs/README.md
@@ -64,7 +64,7 @@ $ sqlite3 gateway_log.db .dump > gateway_log.sql
 
 ## Run the Gateways
 
-We will use `Fabric_Relay` as the gateway for `network1` and `Fabric_Relay2` for `network2`. Install the components and set up appropriate configurations for each according to instructions in https://hyperledger.github.io/cacti/weaver/getting-started/test-network/setup-local/#fabric-relay. Use the same instructions to launch relays (as called out below):
+We will use `Fabric_Relay` as the gateway for `network1` and `Fabric_Relay2` for `network2`. Install the components and set up appropriate configurations for each according to instructions in https://hyperledger-cacti.github.io/cacti/weaver/getting-started/test-network/setup-local/#fabric-relay. Use the same instructions to launch relays (as called out below):
 
 To launch a gateway for Fabric `network1`, run from a new terminal window:
 ```
@@ -82,7 +82,7 @@ $ RELAY_CONFIG=config/Fabric_Relay2.toml cargo run --bin server
 
 Ensure that you have the correct configuration in the file .env
 In a new terminal, run the following commands:
-We will use the default drivers associated with `Fabric_Relay` and `Fabric_Relay2` as specified in https://hyperledger.github.io/cacti/weaver/getting-started/test-network/setup-local. Install the components and set up appropriate configurations for each according to instructions in https://hyperledger.github.io/cacti/weaver/getting-started/test-network/setup-local/#fabric-driver. Use the same instructions to launch drivers (as called out below):
+We will use the default drivers associated with `Fabric_Relay` and `Fabric_Relay2` as specified in https://hyperledger-cacti.github.io/cacti/weaver/getting-started/test-network/setup-local. Install the components and set up appropriate configurations for each according to instructions in https://hyperledger-cacti.github.io/cacti/weaver/getting-started/test-network/setup-local/#fabric-driver. Use the same instructions to launch drivers (as called out below):
 
 To launch a driver for Fabric `network1`, run from a new terminal window:
 ```
@@ -97,7 +97,7 @@ $ CONNECTION_PROFILE=/opt/gopath/src/github.com/VRamakrishna/cacti/weaver/tests/
 
 ## Configure the Fabric-CLI
 
-Configure Fabric-CLI parameters in a `config.json` and a `.env` as indicated in https://hyperledger.github.io/cacti/weaver/getting-started/test-network/ledger-initialization/#initializing-the-fabric-networks (use instructions for relays and drivers deployed in host machines). In the `config.json`, make sure the `chaincode` values are set to `satpsimpleasset`. For the `.env`, only the following settings are mandatory:
+Configure Fabric-CLI parameters in a `config.json` and a `.env` as indicated in https://hyperledger-cacti.github.io/cacti/weaver/getting-started/test-network/ledger-initialization/#initializing-the-fabric-networks (use instructions for relays and drivers deployed in host machines). In the `config.json`, make sure the `chaincode` values are set to `satpsimpleasset`. For the `.env`, only the following settings are mandatory:
 ```
 MEMBER_CREDENTIAL_FOLDER=<PATH-TO-WEAVER>/samples/fabric/fabric-cli/src/data/credentials
 CONFIG_PATH=./config.json
diff --git a/weaver/rfcs/formats/views/besu.md b/weaver/rfcs/formats/views/besu.md
index a3a39cc04c..b7b5375cdb 100644
--- a/weaver/rfcs/formats/views/besu.md
+++ b/weaver/rfcs/formats/views/besu.md
@@ -76,4 +76,4 @@ message BesuView {
 }
 ```
 
-You can find the besu view_data.proto file [here](https://github.com/hyperledger/cacti/blob/main/weaver/common/protos/besu/view_data.proto).
+You can find the besu view_data.proto file [here](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/common/protos/besu/view_data.proto).
diff --git a/weaver/samples/besu/besu-cli/readme.md b/weaver/samples/besu/besu-cli/readme.md
index b41d1523e3..24955d5ac5 100644
--- a/weaver/samples/besu/besu-cli/readme.md
+++ b/weaver/samples/besu/besu-cli/readme.md
@@ -5,8 +5,8 @@ A CLI for besu-cli.
 ## Asset exchange between two Besu networks
 Here are the steps to exercise asset exchange using the besu-cli tool.
 
-1) Start two Besu test networks following the steps in https://github.com/hyperledger/cacti/tree/main/weaver/tests/network-setups/besu.
-2) Install the interop and token contracts by following the steps in https://github.com/hyperledger/cacti/tree/main/weaver/samples/besu/simpleasset. This will install the interop contract for exchanging ERC20 tokens in both the networks and the sample token contracts, `AliceERC20` and `BobERC20`, in `network1` and `network2` respectively.
+1) Start two Besu test networks following the steps in https://github.com/hyperledger-cacti/cacti/tree/main/weaver/tests/network-setups/besu.
+2) Install the interop and token contracts by following the steps in https://github.com/hyperledger-cacti/cacti/tree/main/weaver/samples/besu/simpleasset. This will install the interop contract for exchanging ERC20 tokens in both the networks and the sample token contracts, `AliceERC20` and `BobERC20`, in `network1` and `network2` respectively.
 3) If a `config.json` doesn't exist, create one by making a copy of `config.template.json`. In that file, set the `interopContract` and `tokenContract` fields for the two networks. The fields will correspond to the relative path of the truffle compiled json files for these contracts with respect to the root folder of besu-cli.
 4) When running the exchange command, also set the `senderAccountIndex` and the `recipientAccountIndex` for the two networks.
 
diff --git a/weaver/samples/besu/simpleasset/package.json b/weaver/samples/besu/simpleasset/package.json
index 59f8ee0cbb..dbed96bf2f 100644
--- a/weaver/samples/besu/simpleasset/package.json
+++ b/weaver/samples/besu/simpleasset/package.json
@@ -10,11 +10,11 @@
     "solidity",
     "smart-contract"
   ],
-  "homepage": "https://github.com/hyperledger/cacti/weaver/samples/besu/simpleasset",
+  "homepage": "https://github.com/hyperledger-cacti/cacti/weaver/samples/besu/simpleasset",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
-  "repository": "https://github.com/hyperledger/cacti/samples/besu/simpleasset",
+  "repository": "https://github.com/hyperledger-cacti/cacti/samples/besu/simpleasset",
   "license": "Apache-2.0",
   "directories": {
     "doc": "docs",
diff --git a/weaver/samples/besu/simplestate/package.json b/weaver/samples/besu/simplestate/package.json
index 506ad83797..f358f33715 100644
--- a/weaver/samples/besu/simplestate/package.json
+++ b/weaver/samples/besu/simplestate/package.json
@@ -10,11 +10,11 @@
     "solidity",
     "smart-contract"
   ],
-  "homepage": "https://github.com/hyperledger/cacti/weaver/samples/besu/simplestate",
+  "homepage": "https://github.com/hyperledger-cacti/cacti/weaver/samples/besu/simplestate",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
-  "repository": "https://github.com/hyperledger/cacti/samples/besu/simplestate",
+  "repository": "https://github.com/hyperledger-cacti/cacti/samples/besu/simplestate",
   "license": "Apache-2.0",
   "directories": {
     "doc": "docs",
diff --git a/weaver/samples/corda/corda-simple-application/README.md b/weaver/samples/corda/corda-simple-application/README.md
index 4a1062d432..5ba10a21ba 100644
--- a/weaver/samples/corda/corda-simple-application/README.md
+++ b/weaver/samples/corda/corda-simple-application/README.md
@@ -347,7 +347,7 @@ single repo, instead of across multiple.
 ## Asset Transfer
 ### Transfer or recover token (Corda fungible house-token) assets
 
-Assume that the `ledger initialization` of Corda networks was already carried out (refer to [Initialing the Corda Networks](https://github.com/hyperledger/cacti/blob/main/weaver/docs/docs/external/getting-started/test-network/ledger-initialization.md#initializing-the-corda-networks-2)).
+Assume that the `ledger initialization` of Corda networks was already carried out (refer to [Initialing the Corda Networks](https://github.com/hyperledger-cacti/cacti/blob/main/weaver/docs/docs/external/getting-started/test-network/ledger-initialization.md#initializing-the-corda-networks-2)).
 - Update value for `flowPackage` as `net.corda.samples.tokenizedhouse.flows` for the networks `Corda_Network` and `Corda_Network2` (as the CorDapp `fungible-house-token` was deployed instead of `cordaSimpleApplication` on the networks).
   * This update is required even if relays and drivers are deployed in the host machine.
 - The `save-cert` command during ledger initialization fetches the certificate of the parties in base64 format and stores in the folder `clients/src/main/resources/config/credentials/remoteNetworkUsers` with filename `Corda_Network_UsersAndCerts.json` and `Corda_Network2_UsersAndCerts.json` corresponding to `Corda_Network` and `Corda_Network2` respectively. These files are referred during pledge to fetch the certificate of the recipient of the transferred asset, and during claim to fetch the certificate of the pledger of the asset. *This is because, asset transfer doesn't require both the parties being members of neither in the export nor in the import network. It's just sufficient that pledger is part of the asset export network and claimer is part of the asset import network*.
diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json
index 472e49f5f5..783cf5e630 100644
--- a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json
+++ b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json
@@ -75,7 +75,7 @@
   "licenses": [
     {
       "type": "Apache-2.0",
-      "url": "https://github.com/hyperledger/cacti/blob/main/weaver/LICENSE"
+      "url": "https://github.com/hyperledger-cacti/cacti/blob/main/weaver/LICENSE"
     }
   ],
   "tag": "latest"
diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package.json b/weaver/sdks/fabric/interoperation-node-sdk/package.json
index 2f44bcbff7..b63bfbf552 100644
--- a/weaver/sdks/fabric/interoperation-node-sdk/package.json
+++ b/weaver/sdks/fabric/interoperation-node-sdk/package.json
@@ -75,7 +75,7 @@
   "licenses": [
     {
       "type": "Apache-2.0",
-      "url": "https://github.com/hyperledger/cacti/blob/main/weaver/LICENSE"
+      "url": "https://github.com/hyperledger-cacti/cacti/blob/main/weaver/LICENSE"
     }
   ],
   "tag": "latest"
diff --git a/weaver/tests/network-setups/besu/package.json b/weaver/tests/network-setups/besu/package.json
index 5e48ee8d3f..f98840914e 100644
--- a/weaver/tests/network-setups/besu/package.json
+++ b/weaver/tests/network-setups/besu/package.json
@@ -13,7 +13,7 @@
   "author": "",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/hyperledger/cacti/issues"
+    "url": "https://github.com/hyperledger-cacti/cacti/issues"
   },
   "homepage": "https://github.com/hyperledger/cacti#readme",
   "dependencies": {
diff --git a/whitepaper/whitepaper.md b/whitepaper/whitepaper.md
index e549f91bce..167e1a754e 100644
--- a/whitepaper/whitepaper.md
+++ b/whitepaper/whitepaper.md
@@ -21,8 +21,8 @@ Photo by Pontus Wellgraf on Unsplash
 > The whitepaper is currently under construction.
 >
 > Please see the related item in the issue tracker for further details & to join the discussion/work:
-> https://github.com/hyperledger/cacti/issues/2691
+> https://github.com/hyperledger-cacti/cacti/issues/2691
 >
 > To access the old version of the whitepaper, you can use
 > an older commit of the `main` branch, such as this one:
-> https://github.com/hyperledger/cacti/blob/7bb39576080592919bea0ac89646b32105e1748e/whitepaper/whitepaper.md
+> https://github.com/hyperledger-cacti/cacti/blob/7bb39576080592919bea0ac89646b32105e1748e/whitepaper/whitepaper.md