diff --git a/daemon/table/fib-entry.hpp b/daemon/table/fib-entry.hpp
index cf372ac..24489b9 100644
--- a/daemon/table/fib-entry.hpp
+++ b/daemon/table/fib-entry.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2016,  Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -36,15 +36,15 @@
 
 namespace fib {
 
-/** \class NextHopList
- *  \brief represents a collection of nexthops
+/** \class nfd::fib::NextHopList
+ *  \brief Represents a collection of nexthops.
  *
- *  This type has these methods as public API:
- *    iterator<NextHop> begin()
- *    iterator<NextHop> end()
- *    size_t size()
+ *  This type has the following member functions:
+ *  - `iterator<NextHop> begin()`
+ *  - `iterator<NextHop> end()`
+ *  - `size_t size()`
  */
-typedef std::vector<fib::NextHop> NextHopList;
+using NextHopList = std::vector<NextHop>;
 
 /** \brief represents a FIB entry
  */
diff --git a/daemon/table/pit.hpp b/daemon/table/pit.hpp
index cfebb0a..6e8af8a 100644
--- a/daemon/table/pit.hpp
+++ b/daemon/table/pit.hpp
@@ -32,15 +32,15 @@
 namespace nfd {
 namespace pit {
 
-/** \class DataMatchResult
- *  \brief an unordered iterable of all PIT entries matching Data
+/** \class nfd::pit::DataMatchResult
+ *  \brief An unordered iterable of all PIT entries matching Data.
  *
- *  This type shall support:
+ *  This type has the following member functions:
  *  - `iterator<shared_ptr<Entry>> begin()`
  *  - `iterator<shared_ptr<Entry>> end()`
  *  - `size_t size() const`
  */
-typedef std::vector<shared_ptr<Entry>> DataMatchResult;
+using DataMatchResult = std::vector<shared_ptr<Entry>>;
 
 /** \brief represents the Interest Table
  */