diff --git a/src/interest-container.hpp b/src/interest-container.hpp
index de7043a..56c08ce 100644
--- a/src/interest-container.hpp
+++ b/src/interest-container.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2012-2017 University of California, Los Angeles
+ * Copyright (c) 2012-2019 University of California, Los Angeles
  *
  * This file is part of ChronoSync, synchronization library for distributed realtime
  * applications for NDN.
@@ -50,8 +50,8 @@
 public:
   const Interest interest;
   ConstBufferPtr digest;
-  bool           isUnknown;
-  ndn::EventId   expirationEvent;
+  bool isUnknown;
+  ndn::scheduler::EventId expirationEvent;
 };
 
 using UnsatisfiedInterestPtr = shared_ptr<UnsatisfiedInterest>;
diff --git a/src/logic.cpp b/src/logic.cpp
index db6f691..ead98ae 100644
--- a/src/logic.cpp
+++ b/src/logic.cpp
@@ -36,8 +36,6 @@
 
 namespace chronosync {
 
-using ndn::EventId;
-
 const uint8_t EMPTY_DIGEST_VALUE[] = {
   0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14,
   0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24,
diff --git a/src/logic.hpp b/src/logic.hpp
index 1110cdb..fc7935f 100644
--- a/src/logic.hpp
+++ b/src/logic.hpp
@@ -505,10 +505,10 @@
   UpdateCallback m_onUpdate;
 
   // Event
-  ndn::util::scheduler::Scheduler m_scheduler;
-  ndn::util::scheduler::ScopedEventId m_delayedInterestProcessingId;
-  ndn::util::scheduler::ScopedEventId m_reexpressingInterestId;
-  ndn::util::scheduler::ScopedEventId m_resetInterestId;
+  ndn::Scheduler m_scheduler;
+  ndn::scheduler::ScopedEventId m_delayedInterestProcessingId;
+  ndn::scheduler::ScopedEventId m_reexpressingInterestId;
+  ndn::scheduler::ScopedEventId m_resetInterestId;
 
   // Timer
   ndn::random::RandomNumberEngine& m_rng;
diff --git a/tests/unit-tests/test-logic.cpp b/tests/unit-tests/test-logic.cpp
index 50dbd11..95f7401 100644
--- a/tests/unit-tests/test-logic.cpp
+++ b/tests/unit-tests/test-logic.cpp
@@ -219,7 +219,7 @@
   handler[1]->updateSeqNo(2);
   handler[2]->updateSeqNo(4);
 
-  advanceClocks(ndn::time::milliseconds(10), 100);
+  advanceClocks(ndn::time::milliseconds(50), 100);
   BOOST_CHECK_EQUAL(handler[0]->map[handler[1]->logic.getSessionName()], 2);
   BOOST_CHECK_EQUAL(handler[0]->map[handler[2]->logic.getSessionName()], 4);
   BOOST_CHECK_EQUAL(handler[1]->map[handler[2]->logic.getSessionName()], 4);