diff --git a/discovery/src/main/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacket.java b/discovery/src/main/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacket.java
index 1f1803cb4..b1fec77e4 100644
--- a/discovery/src/main/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacket.java
+++ b/discovery/src/main/java/org/ethereum/beacon/discovery/packet/WhoAreYouPacket.java
@@ -29,13 +29,16 @@ public WhoAreYouPacket(BytesValue bytes) {
     super(bytes);
   }
 
-  public static WhoAreYouPacket create(
+  /**
+   * Create a packet by converting {@code destNodeId} to a magic value
+   */
+  public static WhoAreYouPacket createFromNodeId(
       Bytes32 destNodeId, BytesValue authTag, Bytes32 idNonce, UInt64 enrSeq) {
     BytesValue magic = getStartMagic(destNodeId);
-    return create(magic, authTag, idNonce, enrSeq);
+    return createFromMagic(magic, authTag, idNonce, enrSeq);
   }
 
-  public static WhoAreYouPacket create(
+  public static WhoAreYouPacket createFromMagic(
       BytesValue magic, BytesValue authTag, Bytes32 idNonce, UInt64 enrSeq) {
     byte[] rlpListEncoded =
         RlpEncoder.encode(
diff --git a/discovery/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NotExpectedIncomingPacketHandler.java b/discovery/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NotExpectedIncomingPacketHandler.java
index d1d9ce9e2..af006a8c9 100644
--- a/discovery/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NotExpectedIncomingPacketHandler.java
+++ b/discovery/src/main/java/org/ethereum/beacon/discovery/pipeline/handler/NotExpectedIncomingPacketHandler.java
@@ -60,7 +60,7 @@ public void handle(Envelope envelope) {
       Bytes32 idNonce = Bytes32.wrap(idNonceBytes);
       session.setIdNonce(idNonce);
       WhoAreYouPacket whoAreYouPacket =
-          WhoAreYouPacket.create(
+          WhoAreYouPacket.createFromNodeId(
               session.getNodeRecord().getNodeId(),
               authTag,
               idNonce,
diff --git a/discovery/src/test/java/org/ethereum/beacon/discovery/HandshakeHandlersTest.java b/discovery/src/test/java/org/ethereum/beacon/discovery/HandshakeHandlersTest.java
index 28aa81774..875db6848 100644
--- a/discovery/src/test/java/org/ethereum/beacon/discovery/HandshakeHandlersTest.java
+++ b/discovery/src/test/java/org/ethereum/beacon/discovery/HandshakeHandlersTest.java
@@ -137,7 +137,7 @@ public void authHandlerWithMessageRoundTripTest() throws Exception {
     authTagRepository1.put(authTag, nodeSessionAt1For2);
     envelopeAt1From2.put(
         Field.PACKET_WHOAREYOU,
-        WhoAreYouPacket.create(nodePair1.getValue1().getNodeId(), authTag, idNonce, UInt64.ZERO));
+        WhoAreYouPacket.createFromNodeId(nodePair1.getValue1().getNodeId(), authTag, idNonce, UInt64.ZERO));
     envelopeAt1From2.put(Field.SESSION, nodeSessionAt1For2);
     CompletableFuture<Void> future = new CompletableFuture<>();
     nodeSessionAt1For2.createNextRequest(TaskType.FINDNODE, new TaskOptions(true), future);
diff --git a/discovery/src/test/java/org/ethereum/beacon/discovery/community/PacketEncodingTest.java b/discovery/src/test/java/org/ethereum/beacon/discovery/community/PacketEncodingTest.java
index d16928298..590d22e5b 100644
--- a/discovery/src/test/java/org/ethereum/beacon/discovery/community/PacketEncodingTest.java
+++ b/discovery/src/test/java/org/ethereum/beacon/discovery/community/PacketEncodingTest.java
@@ -30,7 +30,7 @@ public void encodeRandomPacketTest() {
   @Test
   public void encodeWhoAreYouTest() {
     WhoAreYouPacket whoAreYouPacket =
-        WhoAreYouPacket.create(
+        WhoAreYouPacket.createFromMagic(
             BytesValue.fromHexString(
                 "0x0101010101010101010101010101010101010101010101010101010101010101"),
             BytesValue.fromHexString("0x020202020202020202020202"),