--- a/src/routing/click/model/ipv4-click-routing.cc	Wed Feb 23 22:21:28 2011 +0000
+++ b/src/routing/click/model/ipv4-click-routing.cc	Wed Feb 23 22:43:27 2011 +0000
@@ -384,7 +384,7 @@
 {
   Ptr<Ipv4L3ClickProtocol> ipv4l3 = DynamicCast<Ipv4L3ClickProtocol> (m_ipv4);
   NS_ASSERT(ipv4l3);
-  ipv4l3->SetPromisc (ifid);
+  ipv4l3->SetPromiscuous (ifid);
 }
 
 Ptr<Ipv4Route>
@@ -616,10 +616,10 @@
     case SIMCLICK_IF_PROMISC:
       {
         int ifid = va_arg(val, int);
-        clickInstance->SetPromisc (ifid);
+        clickInstance->SetPromiscuous (ifid);
 
         retval = 0;
-        NS_LOG_DEBUG (clickInstance->GetNodeName () << " SIMCLICK_IF_PROMISC: " << ifid << " " << Simulator::Now ());
+        NS_LOG_DEBUG (clickInstance->GetNodeName () << " SIMCLICK_IF_PROMISC: " << ifid << " " << ns3::Simulator::Now ());
         break;
       }
 

--- a/src/routing/click/model/ipv4-l3-click-protocol.cc	Wed Feb 23 22:21:28 2011 +0000
+++ b/src/routing/click/model/ipv4-l3-click-protocol.cc	Wed Feb 23 22:43:27 2011 +0000
@@ -561,7 +561,7 @@
 }
 
 void
-Ipv4L3ClickProtocol::SetPromisc (uint32_t i)
+Ipv4L3ClickProtocol::SetPromiscuous (uint32_t i)
 {
   NS_ASSERT(i <= m_node->GetNDevices ());
   Ptr<NetDevice> netdev = GetNetDevice (i);

--- a/src/routing/click/model/ipv4-l3-click-protocol.h	Wed Feb 23 22:21:28 2011 +0000
+++ b/src/routing/click/model/ipv4-l3-click-protocol.h	Wed Feb 23 22:43:27 2011 +0000
@@ -216,7 +216,7 @@
   void SetDown (uint32_t i);
   bool IsForwarding (uint32_t i) const;
   void SetForwarding (uint32_t i, bool val);
-  void SetPromisc(uint32_t i);
+  void SetPromiscuous(uint32_t i);
 protected:
 
   virtual void DoDispose (void);