diff --git a/src/base/callback.hh b/src/base/callback.hh
index e7afd64e9d..1591f182d6 100644
--- a/src/base/callback.hh
+++ b/src/base/callback.hh
@@ -32,7 +32,7 @@
 #include <functional>
 #include <list>
 
-class CallbackQueue2 : public std::list<std::function<void()>>
+class CallbackQueue : public std::list<std::function<void()>>
 {
   public:
     using Base = std::list<std::function<void()>>;
diff --git a/src/base/statistics.cc b/src/base/statistics.cc
index 156fcbbe4f..5c77ee0b8e 100644
--- a/src/base/statistics.cc
+++ b/src/base/statistics.cc
@@ -518,8 +518,8 @@ registerHandlers(Handler reset_handler, Handler dump_handler)
     dumpHandler = dump_handler;
 }
 
-CallbackQueue2 dumpQueue;
-CallbackQueue2 resetQueue;
+CallbackQueue dumpQueue;
+CallbackQueue resetQueue;
 
 void
 processResetQueue()
diff --git a/src/mem/backdoor.hh b/src/mem/backdoor.hh
index 596aa4edc8..c3391f78cc 100644
--- a/src/mem/backdoor.hh
+++ b/src/mem/backdoor.hh
@@ -113,7 +113,7 @@ class MemBackdoor
     }
 
   private:
-    CallbackQueue2 invalidationCallbacks;
+    CallbackQueue invalidationCallbacks;
 
     AddrRange _range;
     uint8_t *_ptr;
diff --git a/src/sim/core.cc b/src/sim/core.cc
index 8dd5c852fa..8b3624582e 100644
--- a/src/sim/core.cc
+++ b/src/sim/core.cc
@@ -126,10 +126,10 @@ setOutputDir(const string &dir)
 /**
  * Queue of C++ callbacks to invoke on simulator exit.
  */
-inline CallbackQueue2 &
+inline CallbackQueue &
 exitCallbacks()
 {
-    static CallbackQueue2 theQueue;
+    static CallbackQueue theQueue;
     return theQueue;
 }