diff --git a/src/challenge-module.cpp b/src/challenge-module.cpp
index c1f3432..f40e5b9 100644
--- a/src/challenge-module.cpp
+++ b/src/challenge-module.cpp
@@ -124,7 +124,7 @@
   json.put(JSON_REQUEST_ID, requestId);
   std::stringstream ss;
   boost::property_tree::write_json(ss, json);
-  Block jsonBlock = makeStringBlock(ndn::tlv::NameComponent, ss.str());
+  Block jsonBlock = makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
   Name name = caName;
   name.append("_DOWNLOAD").append(jsonBlock);
   return name;
diff --git a/src/challenge-module/challenge-email.cpp b/src/challenge-module/challenge-email.cpp
index c63961c..b65d331 100644
--- a/src/challenge-module/challenge-email.cpp
+++ b/src/challenge-module/challenge-email.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2017, Regents of the University of California.
+ * Copyright (c) 2017-2018, Regents of the University of California.
  *
  * This file is part of ndncert, a certificate management system based on NDN.
  *
@@ -20,7 +20,7 @@
 
 #include "challenge-email.hpp"
 #include "../logging.hpp"
-#include <boost/regex.hpp>
+#include <regex>
 
 namespace ndn {
 namespace ndncert {
@@ -179,9 +179,9 @@
 bool
 ChallengeEmail::isValidEmailAddress(const std::string& emailAddress)
 {
-  std::string pattern = R"_REGEX_((^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9\-\.]+$))_REGEX_";
-  boost::regex emailPattern(pattern);
-  return boost::regex_match(emailAddress, emailPattern);
+  const std::string pattern = R"_REGEX_((^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9\-\.]+$))_REGEX_";
+  static const std::regex emailPattern(pattern);
+  return std::regex_match(emailAddress, emailPattern);
 }
 
 void
diff --git a/src/client-module.cpp b/src/client-module.cpp
index fff47af..0c9565e 100644
--- a/src/client-module.cpp
+++ b/src/client-module.cpp
@@ -508,7 +508,7 @@
 {
   std::stringstream ss;
   boost::property_tree::write_json(ss, json);
-  return makeStringBlock(ndn::tlv::NameComponent, ss.str());
+  return makeStringBlock(ndn::tlv::GenericNameComponent, ss.str());
 }
 
 bool