--- a/src/internet/model/icmpv6-l4-protocol.cc	Fri Sep 07 13:57:29 2018 +0200
+++ b/src/internet/model/icmpv6-l4-protocol.cc	Fri Sep 07 23:57:41 2018 +0200
@@ -900,10 +900,10 @@
 {
   NS_LOG_FUNCTION (this << packet << src << dst << (uint32_t)ttl);
   Ptr<Ipv6L3Protocol> ipv6 = m_node->GetObject<Ipv6L3Protocol> ();
-  SocketIpTtlTag tag;
+  SocketIpv6HopLimitTag tag;
   NS_ASSERT (ipv6 != 0);
 
-  tag.SetTtl (ttl);
+  tag.SetHopLimit (ttl);
   packet->AddPacketTag (tag);
   m_downTarget (packet, src, dst, PROT_NUMBER, 0);
 }
@@ -920,7 +920,7 @@
   Ptr<Ipv6L3Protocol> ipv6 = m_node->GetObject<Ipv6L3Protocol> ();
   NS_ASSERT (ipv6 != 0 && ipv6->GetRoutingProtocol () != 0);
   Ipv6Header header;
-  SocketIpTtlTag tag;
+  SocketIpv6HopLimitTag tag;
   Socket::SocketErrno err;
   Ptr<Ipv6Route> route;
   Ptr<NetDevice> oif (0); //specify non-zero if bound to a source address
@@ -931,7 +931,7 @@
   if (route != 0)
     {
       NS_LOG_LOGIC ("Route exists");
-      tag.SetTtl (ttl);
+      tag.SetHopLimit (ttl);
       packet->AddPacketTag (tag);
       Ipv6Address src = route->GetSource ();