diff --git a/README.adoc b/README.adoc
index 5d9e6124d..efeeade3f 100644
--- a/README.adoc
+++ b/README.adoc
@@ -6,8 +6,8 @@ endif::[]
 :version: 0.12.0
 :version-short: 0.12
 
-image:https://github.com/p2p-org/dshackle/workflows/Tests/badge.svg["Unit Tests"]
-image:https://img.shields.io/github/license/p2p-org/dshackle.svg?style=flat-square&maxAge=2592000["License",link="https://github.com/emeraldpay/dshackle/blob/master/LICENSE"]
+image:https://github.com/drpcorg/dshackle/workflows/Tests/badge.svg["Unit Tests"]
+image:https://img.shields.io/github/license/drpcorg/dshackle.svg?style=flat-square&maxAge=2592000["License",link="https://github.com/emeraldpay/dshackle/blob/master/LICENSE"]
 
 [.lead]
 _Dshackle is a Fault Tolerant Load Balancer for Blockchain API used at https://drpc.org/[DRPC]_
@@ -35,7 +35,7 @@ Provides:
 - Separate public blockchain nodes from your internal servers
 
 === Supported chains
-List of supported chains https://p2p-org.github.io/dshackle/networks.html[here]. Feel free to contribute new chains.
+List of supported chains https://drpcorg.github.io/dshackle/networks.html[here]. Feel free to contribute new chains.
 
 === Architecture
 
@@ -119,7 +119,7 @@ link:docs[See full documentations].
 
 ==== Run docker image
 
-Official Docker image you can find at: https://hub.docker.com/r/p2p-org/dshackle[p2p-org/dshackle]
+Official Docker image you can find at: https://hub.docker.com/r/drpcorg/dshackle[drpcorg/dshackle]
 
 .Setup DRPC key
 [source,bash]
diff --git a/dashboard/README.md b/dashboard/README.md
index 15f5c2200..c24b33ad4 100644
--- a/dashboard/README.md
+++ b/dashboard/README.md
@@ -6,4 +6,4 @@
 2. Go to `Dashboards` -> `Import`
 3. Use the `Import via panel json` option
 
-Additional monitoring docs are available in the [dshackle repo](https://github.com/p2p-org/dshackle/blob/master/docs/06-monitoring.adoc).
+Additional monitoring docs are available in the [dshackle repo](https://github.com/drpcorg/dshackle/blob/master/docs/06-monitoring.adoc).
diff --git a/docs/02-quick-start.adoc b/docs/02-quick-start.adoc
index d307c3460..e19e837dc 100644
--- a/docs/02-quick-start.adoc
+++ b/docs/02-quick-start.adoc
@@ -82,7 +82,7 @@ See detailed xref:reference-configuration.adoc[Configuration Reference]
 
 ==== Run as docker
 
-Official Docker image you can find at: https://hub.docker.com/r/p2p-org/dshackle[p2p-org/dshackle]
+Official Docker image you can find at: https://hub.docker.com/r/drpcorg/dshackle[drpcorg/dshackle]
 
 .Setup DRPC key
 [source,bash]
@@ -93,7 +93,7 @@ export DRPC_KEY=...
 .Run Dshackle
 [source,bash,subs="attributes"]
 ----
-docker run -p 2449:2449 -p 8545:8545 -v $(pwd):/etc/dshackle -e "DRPC_KEY=$DRPC_KEY" p2p-org/dshackle:{version-short}
+docker run -p 2449:2449 -p 8545:8545 -v $(pwd):/etc/dshackle -e "DRPC_KEY=$DRPC_KEY" drpcorg/dshackle:{version-short}
 ----
 
 ==== Access using JSON RPC
diff --git a/docs/04-upstream-config.adoc b/docs/04-upstream-config.adoc
index 0113c211a..d1d84ab8a 100644
--- a/docs/04-upstream-config.adoc
+++ b/docs/04-upstream-config.adoc
@@ -101,7 +101,7 @@ In the example above we have:
 *It's kindly recommended* to strictly associate _node-id_ parameter with a physical node and keep it during any configuration changes
 
 === Supported chains
-List of supported chains could be found https://p2p-org.github.io/dshackle/networks.html[here]
+List of supported chains could be found https://drpcorg.github.io/dshackle/networks.html[here]
 
 === Roles and Fallback upstream
 
@@ -255,9 +255,9 @@ If a client requests to execute method `trace_transaction` then it will be sched
 
 There are also method groups to more easily manage methods in batches, currently there are several groups:
 
-- https://github.com/p2p-org/dshackle/blob/master/src/main/kotlin/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethods.kt#L53[trace]
-- https://github.com/p2p-org/dshackle/blob/master/src/main/kotlin/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethods.kt#L65[debug]
-- https://github.com/p2p-org/dshackle/blob/master/src/main/kotlin/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethods.kt#L41[filter]
+- https://github.com/drpcorg/dshackle/blob/master/src/main/kotlin/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethods.kt#L53[trace]
+- https://github.com/drpcorg/dshackle/blob/master/src/main/kotlin/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethods.kt#L65[debug]
+- https://github.com/drpcorg/dshackle/blob/master/src/main/kotlin/io/emeraldpay/dshackle/upstream/calls/DefaultEthereumMethods.kt#L41[filter]
 - default, all methods that are enabled by default
 [source, yaml]
 ----
diff --git a/docs/05-start.adoc b/docs/05-start.adoc
index 36b2fb6c7..0f39c4c7e 100644
--- a/docs/05-start.adoc
+++ b/docs/05-start.adoc
@@ -8,13 +8,13 @@ Prepare configuration files `dshackle.yaml` and `upstreams.yaml` in the current
 
 [source,bash,subs="attributes"]
 ----
-docker run -p 2449:2449 -v $(pwd):/config -w /config p2p-org/dshackle:{version-short}
+docker run -p 2449:2449 -v $(pwd):/config -w /config drpcorg/dshackle:{version-short}
 ----
 
 === Install & Run manually
 
-1. Download latest release from https://github.com/p2p-org/dshackle/releases
+1. Download latest release from https://github.com/drpcorg/dshackle/releases
 2. Unpack `unzip dshackle-0.6.0.zip`
 3. Copy to `/opt/dshackle`
 4. Setup configuration in `/etc/dshackle`
-5. Run as `cp /etc/dshackle && /opt/dshackle/bin/dshackle`
\ No newline at end of file
+5. Run as `cp /etc/dshackle && /opt/dshackle/bin/dshackle`
diff --git a/docs/07-methods.adoc b/docs/07-methods.adoc
index 171bbeb15..3ea1ee32f 100644
--- a/docs/07-methods.adoc
+++ b/docs/07-methods.adoc
@@ -10,7 +10,7 @@ NOTE: It's not necessary to use gRPC, as Dshackle can provide standard JSON RPC
 
 === gRPC definition
 
-The source code for the Protobuf definitions could be found in https://github.com/p2p-org/emerald-grpc/tree/master/proto[/proto].
+The source code for the Protobuf definitions could be found in https://github.com/drpcorg/emerald-grpc/tree/master/proto[/proto].
 
 .Service API
 [source,proto]
diff --git a/docs/99-ending.adoc b/docs/99-ending.adoc
index b2127a5be..3baf6ceb4 100644
--- a/docs/99-ending.adoc
+++ b/docs/99-ending.adoc
@@ -1,6 +1,6 @@
 == Links
 
-- Github: https://github.com/p2p-org/dshackle
+- Github: https://github.com/drpcorg/dshackle
 
 == Chat
 
@@ -9,4 +9,4 @@ Join our https://drpc.org/discord[Discord]
 == Support
 
 Want to support the project, prioritize a specific feature, or get commercial help with using Dshackle in your project?
-Please contact splix@emeraldpay.io to discuss the possibility
\ No newline at end of file
+Please contact splix@emeraldpay.io to discuss the possibility
diff --git a/docs/README.adoc b/docs/README.adoc
index b013665cb..bfeaeadff 100644
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -46,7 +46,7 @@ Main goals:
 
 == List of supported chains
 
-Can be found here:  https://p2p-org.github.io/dshackle/networks.html
+Can be found here:  https://drpcorg.github.io/dshackle/networks.html
 
 == Reference
 
@@ -58,4 +58,4 @@ Join our https://drpc.org/discord[Discord]
 
 == Links
 
-- Github: https://github.com/p2p-org/dshackle
\ No newline at end of file
+- Github: https://github.com/drpcorg/dshackle
diff --git a/docs/networks.html b/docs/networks.html
index cde712516..7f9a98994 100644
--- a/docs/networks.html
+++ b/docs/networks.html
@@ -55,7 +55,7 @@ <h2>Example config for <span class="_chain"></span></h2>
 
       addEventListener("DOMContentLoaded", async (event) => {
         let response = await fetch(
-          "https://raw.githubusercontent.com/p2p-org/dshackle/master/foundation/src/main/resources/chains.yaml"
+          "https://raw.githubusercontent.com/drpcorg/dshackle/master/foundation/src/main/resources/chains.yaml"
         );
         let chains = yaml.load(await response.text());
         let protocols = chains["chain-settings"].protocols;
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt
index 041714389..6f9fe4ab7 100644
--- a/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt
+++ b/src/main/kotlin/io/emeraldpay/dshackle/upstream/ethereum/EthereumUpstreamValidator.kt
@@ -239,7 +239,7 @@ class EthCallLimitValidator(
         ListParams(
             TransactionCallJson(
                 Address.from(config.callLimitContract),
-                // contract like https://github.com/p2p-org/dshackle/pull/246
+                // contract like https://github.com/drpcorg/dshackle/pull/246
                 // meta + size in hex
                 HexData.from("0xd8a26e3a" + options.callLimitSize.toString(16).padStart(64, '0')),
             ),