diff --git a/daemon/table/cs.hpp b/daemon/table/cs.hpp
index 1d15294..88f171d 100644
--- a/daemon/table/cs.hpp
+++ b/daemon/table/cs.hpp
@@ -80,7 +80,7 @@
   void
   find(const Interest& interest, HitCallback&& hit, MissCallback&& miss) const
   {
-    iterator match = findImpl(interest);
+    auto match = findImpl(interest);
     if (match == m_table.end()) {
       miss(interest);
       return;
@@ -158,9 +158,7 @@
   enableServe(bool shouldServe);
 
 public: // enumeration
-  /** \brief ContentStore iterator (public API)
-   */
-  using const_iterator = iterator;
+  using const_iterator = Table::const_iterator;
 
   const_iterator
   begin() const
@@ -175,13 +173,13 @@
   }
 
 private:
-  std::pair<iterator, iterator>
+  std::pair<const_iterator, const_iterator>
   findPrefixRange(const Name& prefix) const;
 
   size_t
   eraseImpl(const Name& prefix, size_t limit);
 
-  iterator
+  const_iterator
   findImpl(const Interest& interest) const;
 
   void