diff --git a/model/ndn-net-device-face.cpp b/model/ndn-net-device-face.cpp
index 2a6a5aa..e13f949 100644
--- a/model/ndn-net-device-face.cpp
+++ b/model/ndn-net-device-face.cpp
@@ -94,7 +94,7 @@
 {
   NS_LOG_FUNCTION(this << &interest);
 
-  this->onSendInterest(interest);
+  this->emitSignal(onSendInterest, interest);
 
   Ptr<Packet> packet = Convert::ToPacket(interest);
   send(packet);
@@ -105,7 +105,7 @@
 {
   NS_LOG_FUNCTION(this << &data);
 
-  this->onSendData(data);
+  this->emitSignal(onSendData, data);
 
   Ptr<Packet> packet = Convert::ToPacket(data);
   send(packet);
@@ -124,11 +124,11 @@
     uint32_t type = Convert::getPacketType(p);
     if (type == ::ndn::tlv::Interest) {
       shared_ptr<const Interest> i = Convert::FromPacket<Interest>(packet);
-      this->onReceiveInterest(*i);
+      this->emitSignal(onReceiveInterest, *i);
     }
     else if (type == ::ndn::tlv::Data) {
       shared_ptr<const Data> d = Convert::FromPacket<Data>(packet);
-      this->onReceiveData(*d);
+      this->emitSignal(onReceiveData, *d);
     }
     else {
       NS_LOG_ERROR("Unsupported TLV packet");