--- a/src/spectrum/helper/adhoc-aloha-noack-ideal-phy-helper.cc	Mon Mar 28 16:43:20 2011 -0700
+++ b/src/spectrum/helper/adhoc-aloha-noack-ideal-phy-helper.cc	Tue Mar 29 15:46:03 2011 +0200
@@ -129,10 +129,10 @@
       dev->SetChannel (m_channel);
       m_channel->AddRx (phy);
 
-      phy->SetPhyMacTxEndCallback   (MakeCallback (&AlohaNoackNetDevice::NotifyTransmissionEnd, dev));
-      phy->SetPhyMacRxStartCallback (MakeCallback (&AlohaNoackNetDevice::NotifyReceptionStart, dev));
-      phy->SetPhyMacRxEndOkCallback (MakeCallback (&AlohaNoackNetDevice::NotifyReceptionEndOk, dev));
-      dev->SetPhyMacTxStartCallback (MakeCallback (&HalfDuplexIdealPhy::StartTx, phy));
+      phy->SetGenericPhyTxEndCallback   (MakeCallback (&AlohaNoackNetDevice::NotifyTransmissionEnd, dev));
+      phy->SetGenericPhyRxStartCallback (MakeCallback (&AlohaNoackNetDevice::NotifyReceptionStart, dev));
+      phy->SetGenericPhyRxEndOkCallback (MakeCallback (&AlohaNoackNetDevice::NotifyReceptionEndOk, dev));
+      dev->SetGenericPhyTxStartCallback (MakeCallback (&HalfDuplexIdealPhy::StartTx, phy));
 
       node->AddDevice (dev);
       devices.Add (dev);