1 files changed, 4 insertions, 4 deletions
diff --git a/pw_tokenizer/token_database.cc b/pw_tokenizer/token_database.cc
index 42c145b67..7ab5d6b28 100644
--- a/pw_tokenizer/token_database.cc
+++ b/pw_tokenizer/token_database.cc
@@ -17,20 +17,20 @@
 namespace pw::tokenizer {
 
 TokenDatabase::Entry TokenDatabase::Entries::operator[](size_t index) const {
-  Iterator it = begin();
+  iterator it = begin();
   for (size_t i = 0; i < index; ++i) {
     ++it;
   }
-  return it.entry();
+  return *it;
 }
 
 TokenDatabase::Entries TokenDatabase::Find(const uint32_t token) const {
-  Iterator first = begin();
+  iterator first = begin();
   while (first != end() && token > first->token) {
     ++first;
   }
 
-  Iterator last = first;
+  iterator last = first;
   while (last != end() && token == last->token) {
     ++last;
   }