diff --git a/daemon/table/cs-policy-lru.hpp b/daemon/table/cs-policy-lru.hpp
index bea845c..81f65bb 100644
--- a/daemon/table/cs-policy-lru.hpp
+++ b/daemon/table/cs-policy-lru.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -72,19 +72,19 @@
 
 private:
   virtual void
-  doAfterInsert(iterator i) DECL_OVERRIDE;
+  doAfterInsert(iterator i) override;
 
   virtual void
-  doAfterRefresh(iterator i) DECL_OVERRIDE;
+  doAfterRefresh(iterator i) override;
 
   virtual void
-  doBeforeErase(iterator i) DECL_OVERRIDE;
+  doBeforeErase(iterator i) override;
 
   virtual void
-  doBeforeUse(iterator i) DECL_OVERRIDE;
+  doBeforeUse(iterator i) override;
 
   virtual void
-  evictEntries() DECL_OVERRIDE;
+  evictEntries() override;
 
 private:
   /** \brief moves an entry to the end of queue
diff --git a/daemon/table/cs-policy-priority-fifo.hpp b/daemon/table/cs-policy-priority-fifo.hpp
index 0078c71..c453990 100644
--- a/daemon/table/cs-policy-priority-fifo.hpp
+++ b/daemon/table/cs-policy-priority-fifo.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2015,  Regents of the University of California,
+ * Copyright (c) 2014-2016,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -83,19 +83,19 @@
 
 private:
   virtual void
-  doAfterInsert(iterator i) DECL_OVERRIDE;
+  doAfterInsert(iterator i) override;
 
   virtual void
-  doAfterRefresh(iterator i) DECL_OVERRIDE;
+  doAfterRefresh(iterator i) override;
 
   virtual void
-  doBeforeErase(iterator i) DECL_OVERRIDE;
+  doBeforeErase(iterator i) override;
 
   virtual void
-  doBeforeUse(iterator i) DECL_OVERRIDE;
+  doBeforeUse(iterator i) override;
 
   virtual void
-  evictEntries() DECL_OVERRIDE;
+  evictEntries() override;
 
 private:
   /** \brief evicts one entry
@@ -126,11 +126,11 @@
   EntryInfoMapFifo m_entryInfoMap;
 };
 
-} // namespace priorityfifo
+} // namespace priority_fifo
 
 using priority_fifo::PriorityFifoPolicy;
 
 } // namespace cs
 } // namespace nfd
 
-#endif // NFD_DAEMON_TABLE_CS_POLICY_FIFO_HPP
\ No newline at end of file
+#endif // NFD_DAEMON_TABLE_CS_POLICY_FIFO_HPP