diff --git a/ndn-cpp/encoding/BinaryXMLWireFormat.cpp b/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
index b453794..9d7b79c 100644
--- a/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
+++ b/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
@@ -7,12 +7,28 @@
 #include <stdexcept>
 #include "../c/encoding/BinaryXMLName.h"
 #include "../Name.hpp"
+#include "BinaryXMLEncoder.hpp"
 #include "BinaryXMLWireFormat.hpp"
 
+using namespace std;
+
 namespace ndn {
 
 BinaryXMLWireFormat BinaryXMLWireFormat::instance_;
 
+void BinaryXMLWireFormat::encodeName(Name &name, vector<unsigned char> &output) 
+{
+  struct ndn_Name nameStruct;
+  struct ndn_NameComponent components[100];
+  ndn_Name_init(&nameStruct, components, sizeof(components) / sizeof(components[0]));
+  name.get(nameStruct);
+
+  BinaryXMLEncoder encoder;
+  ndn_encodeBinaryXMLName(&nameStruct, encoder.getEncoder());
+          
+  output = vector<unsigned char>(encoder.getEncoder()->output.array, encoder.getEncoder()->output.array + encoder.getEncoder()->offset);
+}
+
 void BinaryXMLWireFormat::decodeName(Name &name, const unsigned char *input, unsigned int inputLength)
 {
   struct ndn_NameComponent components[100];
@@ -22,10 +38,8 @@
   char *error;
   if (error = ndn_decodeBinaryXMLName(&nameStruct, (unsigned char *)input, inputLength))
     throw std::runtime_error(error);
-  
-  name.clear();
-  for (int i = 0; i < nameStruct.nComponents; ++i)
-    name.addComponent(nameStruct.components[i].value, nameStruct.components[i].valueLength);
+
+  name.set(nameStruct);
 }
 
 }
diff --git a/ndn-cpp/encoding/BinaryXMLWireFormat.hpp b/ndn-cpp/encoding/BinaryXMLWireFormat.hpp
index 46f0d21..e6d7c8a 100644
--- a/ndn-cpp/encoding/BinaryXMLWireFormat.hpp
+++ b/ndn-cpp/encoding/BinaryXMLWireFormat.hpp
@@ -14,7 +14,7 @@
 
 class BinaryXMLWireFormat : public WireFormat {
 public:
-  //virtual void encodeName(Name &name, std::vector<unsigned char> &output);
+  virtual void encodeName(Name &name, std::vector<unsigned char> &output);
   virtual void decodeName(Name &name, const unsigned char *input, unsigned int inputLength);
 
   //virtual void encodeInterest(Interest &interest, std::vector<unsigned char> &output);