diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -121,10 +121,6 @@
 // called to clean up database connections, and stop other threads that should
 // only be stopped after the main network-processing threads have exited.
 //
-// Note that if running -daemon the parent process returns from AppInit2 before
-// adding any threads to the threadGroup, so .join_all() returns immediately and
-// the parent exits from main().
-//
 // Shutdown for Qt is very similar, only it uses a QTimer to detect
 // fRequestShutdown getting set, and then does the normal Qt shutdown thing.
 //
@@ -193,10 +189,10 @@
         return;
     }
 
-    /// Note: Shutdown() must be able to handle cases in which AppInit2() failed
-    /// part of the way, for example if the data directory was found to be
-    /// locked. Be sure that anything that writes files or flushes caches only
-    /// does this if the respective module was initialized.
+    /// Note: Shutdown() must be able to handle cases in which initialization
+    /// failed part of the way, for example if the data directory was found to
+    /// be locked. Be sure that anything that writes files or flushes caches
+    /// only does this if the respective module was initialized.
     RenameThread("bitcoin-shutoff");
     g_mempool.AddTransactionsUpdated(1);
 
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -456,7 +456,7 @@
         quit();
         return;
     }
-    // Log this only after AppInit2 finishes, as then logging setup is
+    // Log this only after AppInitMain finishes, as then logging setup is
     // guaranteed complete.
     qWarning() << "Platform customization:" << platformStyle->getName();
 #ifdef ENABLE_WALLET
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -83,7 +83,8 @@
 static CSignatureCache signatureCache;
 } // namespace
 
-// To be called once in AppInit2/TestingSetup to initialize the signatureCache
+// To be called once in AppInitMain/BasicTestingSetup to initialize the
+// signatureCache.
 void InitSignatureCache() {
     // nMaxCacheSize is unsigned. If -maxsigcachesize is set to zero,
     // setup_bytes creates the minimum possible cache (2 elements).