diff --git a/ndn-cpp/data.hpp b/ndn-cpp/data.hpp
index bb616fb..7da6dad 100644
--- a/ndn-cpp/data.hpp
+++ b/ndn-cpp/data.hpp
@@ -84,29 +84,29 @@
   
 class Data {
 public:
-  ptr_lib::shared_ptr<std::vector<unsigned char> > encode(WireFormat &wireFormat) const 
+  ptr_lib::shared_ptr<std::vector<unsigned char> > wireEncode(WireFormat &wireFormat) const 
   {
     return wireFormat.encodeData(*this);
   }
-  ptr_lib::shared_ptr<std::vector<unsigned char> > encode() const 
+  ptr_lib::shared_ptr<std::vector<unsigned char> > wireEncode() const 
   {
-    return encode(*WireFormat::getDefaultWireFormat());
+    return wireEncode(*WireFormat::getDefaultWireFormat());
   }
-  void decode(const unsigned char *input, unsigned int inputLength, WireFormat &wireFormat) 
+  void wireDecode(const unsigned char *input, unsigned int inputLength, WireFormat &wireFormat) 
   {
     wireFormat.decodeData(*this, input, inputLength);
   }
-  void decode(const unsigned char *input, unsigned int inputLength) 
+  void wireDecode(const unsigned char *input, unsigned int inputLength) 
   {
-    decode(input, inputLength, *WireFormat::getDefaultWireFormat());
+    wireDecode(input, inputLength, *WireFormat::getDefaultWireFormat());
   }
-  void decode(const std::vector<unsigned char> &input, WireFormat &wireFormat) 
+  void wireDecode(const std::vector<unsigned char> &input, WireFormat &wireFormat) 
   {
-    decode(&input[0], input.size(), wireFormat);
+    wireDecode(&input[0], input.size(), wireFormat);
   }
-  void decode(const std::vector<unsigned char> &input) 
+  void wireDecode(const std::vector<unsigned char> &input) 
   {
-    decode(&input[0], input.size());
+    wireDecode(&input[0], input.size());
   }
   
   /**