diff --git a/tools/ndn-autoconfig/procedure.hpp b/tools/ndn-autoconfig/procedure.hpp
index 0af3980..3f1f630 100644
--- a/tools/ndn-autoconfig/procedure.hpp
+++ b/tools/ndn-autoconfig/procedure.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -74,11 +74,12 @@
   registerPrefixes(uint64_t hubFaceId, size_t index = 0);
 
 public:
-  /** \brief Signal when procedure completes.
+  /**
+   * \brief Signal emitted when the procedure completes.
    *
-   *  Argument indicates whether the procedure succeeds (true) or fails (false).
+   * Argument indicates whether the procedure succeeds (true) or fails (false).
    */
-  util::Signal<Procedure, bool> onComplete;
+  signal::Signal<Procedure, bool> onComplete;
 
 NFD_PROTECTED_WITH_TESTS_ELSE_PRIVATE:
   std::vector<unique_ptr<Stage>> m_stages;
diff --git a/tools/ndn-autoconfig/stage.hpp b/tools/ndn-autoconfig/stage.hpp
index 7c1247c..04d584d 100644
--- a/tools/ndn-autoconfig/stage.hpp
+++ b/tools/ndn-autoconfig/stage.hpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2022,  Regents of the University of California,
+ * Copyright (c) 2014-2023,  Regents of the University of California,
  *                           Arizona Board of Regents,
  *                           Colorado State University,
  *                           University Pierre & Marie Curie, Sorbonne University,
@@ -33,7 +33,8 @@
 
 namespace ndn::autoconfig {
 
-/** \brief A discovery stage.
+/**
+ * \brief A discovery stage.
  */
 class Stage : boost::noncopyable
 {
@@ -76,17 +77,19 @@
   doStart() = 0;
 
 public:
-  /** \brief Signal when a HUB FaceUri is found.
+  /**
+   * \brief Signal emitted when a HUB FaceUri is found.
    *
-   *  Argument is HUB FaceUri, may not be canonical.
+   * Argument is HUB FaceUri, may not be canonical.
    */
-  util::Signal<Stage, FaceUri> onSuccess;
+  signal::Signal<Stage, FaceUri> onSuccess;
 
-  /** \brief Signal when discovery fails.
+  /**
+   * \brief Signal emitted when discovery fails.
    *
-   *  Argument is error message.
+   * Argument is error message.
    */
-  util::Signal<Stage, std::string> onFailure;
+  signal::Signal<Stage, std::string> onFailure;
 
 private:
   bool m_isInProgress = false;