diff --git a/nimbus.nimble b/nimbus.nimble
index 87e0e78c8..ccfe54dae 100644
--- a/nimbus.nimble
+++ b/nimbus.nimble
@@ -12,8 +12,8 @@ requires "nim >= 0.18.1",
          "rlp",
          "stint",
          "https://github.com/status-im/nim-eth-common",
-         "https://github.com/status-im/nim-eth-p2p",
-         "https://github.com/status-im/nim-eth-keyfile"
+         "eth_p2p",
+         "eth_keyfile"
 
 proc test(name: string, lang = "c") =
   if not dirExists "build":
diff --git a/nimbus/config.nim b/nimbus/config.nim
index e8f4bc3ac..4d261d008 100644
--- a/nimbus/config.nim
+++ b/nimbus/config.nim
@@ -7,7 +7,7 @@
 # This file may not be copied, modified, or distributed except according to
 # those terms.
 
-import parseopt, strutils, net, ethp2p, eth_keyfile, eth_keys, json,
+import parseopt, strutils, net, eth_p2p, eth_keyfile, eth_keys, json,
        nimcrypto
 
 const
diff --git a/nimbus/p2p/disc4service.nim b/nimbus/p2p/disc4service.nim
index fb2f474e5..8ed8099db 100644
--- a/nimbus/p2p/disc4service.nim
+++ b/nimbus/p2p/disc4service.nim
@@ -8,7 +8,7 @@
 # those terms.
 
 import asyncdispatch, net           # stdlib modules
-import ethp2p, eth_keys, nimcrypto  # external modules
+import eth_p2p, eth_keys, nimcrypto # external modules
 import service, ../config           # internal modules
 
 type