all: InterestHeader and ContentObjectHeader refactoring to Interest and ContentObject

refs #29
diff --git a/test/ndnSIM-serialization.cc b/test/ndnSIM-serialization.cc
index 16ddb51..2d42d93 100644
--- a/test/ndnSIM-serialization.cc
+++ b/test/ndnSIM-serialization.cc
@@ -36,7 +36,7 @@
 void
 InterestSerializationTest::DoRun ()
 {
-  InterestHeader source;
+  Interest source;
   
   source.SetName (Create<Name> (boost::lexical_cast<Name> ("/test/test2")));
   NS_TEST_ASSERT_MSG_EQ (source.GetName (), boost::lexical_cast<Name> ("/test/test2"), "set/get name failed");
@@ -58,7 +58,7 @@
   packet.AddHeader (source);
 	
   //deserialization
-  InterestHeader target;
+  Interest target;
   packet.RemoveHeader (target);
   
   NS_TEST_ASSERT_MSG_EQ (source.GetName ()            , target.GetName ()            , "source/target name failed");
@@ -71,7 +71,7 @@
 void
 ContentObjectSerializationTest::DoRun ()
 {
-  ContentObjectHeader source;
+  ContentObject source;
   
   source.SetName (Create<Name> (boost::lexical_cast<Name> ("/test/test2/1")));
   NS_TEST_ASSERT_MSG_EQ (source.GetName (), boost::lexical_cast<Name> ("/test/test2/1"), "set/get name failed");
@@ -87,7 +87,7 @@
   packet.AddHeader (source);
 	
   //deserialization
-  ContentObjectHeader target;
+  ContentObject target;
   packet.RemoveHeader (target);
   
   NS_TEST_ASSERT_MSG_EQ (source.GetName ()     , target.GetName ()     , "source/target name failed");