model: Another set of refactoring/renaming to make code compile (not tested yet)

Refs #1005 (http://redmine.named-data.net/)
diff --git a/model/ndn-net-device-face.cc b/model/ndn-net-device-face.cc
index 03a9cca..eb2b357 100644
--- a/model/ndn-net-device-face.cc
+++ b/model/ndn-net-device-face.cc
@@ -95,14 +95,14 @@
 void
 NetDeviceFace:: UnRegisterProtocolHandlers ()
 {
-  m_node->UnRegisterProtocolHandler (MakeCallback (&NetDeviceFace::ReceiveFromNetDevice, this));
+  m_node->UnregisterProtocolHandler (MakeCallback (&NetDeviceFace::ReceiveFromNetDevice, this));
   Face::UnRegisterProtocolHandlers ();
 }
 
 bool
 NetDeviceFace::Send (Ptr<Packet> packet)
 {
-  if (!Face::Send ())
+  if (!Face::Send (packet))
     {
       return false;
     }