diff -crB helperold/csma-helper.cc helper/csma-helper.cc
*** helperold/csma-helper.cc	Fri Jul  3 15:39:36 2009
--- helper/csma-helper.cc	Fri Jul  3 15:44:48 2009
***************
*** 27,32 ****
--- 27,33 ----
  #include "ns3/config.h"
  #include "ns3/packet.h"
  #include "ns3/names.h"
+ #include "ns3/node-list.h"
  #include <string>
  
  namespace ns3 {
***************
*** 75,81 ****
        return;
      }
    oss.str ("");
!   oss << filename << "-" << nodeid << "-" << deviceid << ".pcap";
    Ptr<PcapWriter> pcap = Create<PcapWriter> ();
    pcap->Open (oss.str ());
    pcap->WriteEthernetHeader ();
--- 76,101 ----
        return;
      }
    oss.str ("");
!   std::string nodename=Names::FindName(NodeList::GetNode(nodeid));
!   std::string devicename=Names::FindName(NodeList::GetNode(nodeid)->GetDevice(deviceid));
!   oss << filename << "-";
!   if (nodename!="")
!     {
!       oss << nodename << "-";
!     }
!     else
!     {
!       oss << nodeid << "-";
!     }
!   if (devicename!="")
!     {
!       oss << devicename;
!     }
!     else
!     {
!       oss << deviceid;
!     }
!   oss << ".pcap";
    Ptr<PcapWriter> pcap = Create<PcapWriter> ();
    pcap->Open (oss.str ());
    pcap->WriteEthernetHeader ();
diff -crB helperold/point-to-point-helper.cc helper/point-to-point-helper.cc
*** helperold/point-to-point-helper.cc	Fri Jul  3 15:39:23 2009
--- helper/point-to-point-helper.cc	Fri Jul  3 15:44:55 2009
***************
*** 26,31 ****
--- 26,32 ----
  #include "ns3/config.h"
  #include "ns3/packet.h"
  #include "ns3/names.h"
+ #include "ns3/node-list.h"
  
  namespace ns3 {
  
***************
*** 74,80 ****
        return;
      }
    oss.str ("");
!   oss << filename << "-" << nodeid << "-" << deviceid << ".pcap";
    Ptr<PcapWriter> pcap = Create<PcapWriter> ();
    pcap->Open (oss.str ());
    pcap->WritePppHeader ();
--- 75,100 ----
        return;
      }
    oss.str ("");
!   std::string nodename=Names::FindName(NodeList::GetNode(nodeid));
!   std::string devicename=Names::FindName(NodeList::GetNode(nodeid)->GetDevice(deviceid));
!   oss << filename << "-";
!   if (nodename!="")
!     {
!       oss << nodename << "-";
!     }
!     else
!     {
!       oss << nodeid << "-";
!     }
!   if (devicename!="")
!     {
!       oss << devicename;
!     }
!     else
!     {
!       oss << deviceid;
!     }
!   oss << ".pcap";
    Ptr<PcapWriter> pcap = Create<PcapWriter> ();
    pcap->Open (oss.str ());
    pcap->WritePppHeader ();