diff --git a/SConstruct b/SConstruct
index 9c4bcf74e..65029dc46 100644
--- a/SConstruct
+++ b/SConstruct
@@ -269,7 +269,7 @@ inode.add_sources ([
     'arp-header.cc',
     'arp-cache.cc',
     'arp-ipv4-interface.cc',
-    'arp.cc',
+    'arp-l3-protocol.cc',
     'ipv4-loopback-interface.cc',
     'header-utils.cc',
     'udp-socket.cc',
@@ -287,7 +287,7 @@ inode.add_headers ([
     'ipv4-checksum.h',
     'arp-header.h',
     'arp-cache.h',
-    'arp.h',
+    'arp-l3-protocol.h',
     'ipv4-loopback-interface.h',
     'l3-demux.h',
     'header-utils.h',
diff --git a/src/internet-node/arp.cc b/src/internet-node/arp-l3-protocol.cc
similarity index 99%
rename from src/internet-node/arp.cc
rename to src/internet-node/arp-l3-protocol.cc
index 3a085793e..80fc70d67 100644
--- a/src/internet-node/arp.cc
+++ b/src/internet-node/arp-l3-protocol.cc
@@ -24,7 +24,7 @@
 #include "ns3/node.h"
 #include "ns3/net-device.h"
 
-#include "arp.h"
+#include "arp-l3-protocol.h"
 #include "arp-header.h"
 #include "arp-cache.h"
 #include "ipv4-interface.h"
diff --git a/src/internet-node/arp.h b/src/internet-node/arp-l3-protocol.h
similarity index 100%
rename from src/internet-node/arp.h
rename to src/internet-node/arp-l3-protocol.h
diff --git a/src/internet-node/i-arp-private.cc b/src/internet-node/i-arp-private.cc
index a8d5bd864..9ba38af87 100644
--- a/src/internet-node/i-arp-private.cc
+++ b/src/internet-node/i-arp-private.cc
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "i-arp-private.h"
-#include "arp.h"
+#include "arp-l3-protocol.h"
 #include "ns3/assert.h"
 #include "ns3/net-device.h"
 
diff --git a/src/internet-node/internet-node.cc b/src/internet-node/internet-node.cc
index 089cf5b89..c2ac01e4d 100644
--- a/src/internet-node/internet-node.cc
+++ b/src/internet-node/internet-node.cc
@@ -29,7 +29,7 @@
 #include "internet-node.h"
 #include "udp.h"
 #include "ipv4-l3-protocol.h"
-#include "arp.h"
+#include "arp-l3-protocol.h"
 #include "i-udp-impl.h"
 #include "i-arp-private.h"
 #include "i-ipv4-impl.h"