diff --git a/src/machine.rs b/src/machine.rs
index a7d62897b8f..b56755083f4 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -27,7 +27,7 @@ use rustc_target::abi::{LayoutOf, Size};
 
 use crate::*;
 
-pub use crate::threads::{ThreadId, ThreadSet, ThreadState, ThreadLocalStorage};
+pub use crate::threads::{ThreadId, ThreadManager, ThreadState, ThreadLocalStorage};
 
 // Some global facts about the emulated machine.
 pub const PAGE_SIZE: u64 = 4 * 1024; // FIXME: adjust to target architecture
@@ -257,7 +257,7 @@ pub struct Evaluator<'mir, 'tcx> {
     pub(crate) time_anchor: Instant,
 
     /// The set of threads.
-    pub(crate) threads: ThreadSet<'mir, 'tcx>,
+    pub(crate) threads: ThreadManager<'mir, 'tcx>,
 
     /// Precomputed `TyLayout`s for primitive data types that are commonly used inside Miri.
     pub(crate) layouts: PrimitiveLayouts<'tcx>,
diff --git a/src/threads.rs b/src/threads.rs
index 5991ba4ed1f..2352f26ebee 100644
--- a/src/threads.rs
+++ b/src/threads.rs
@@ -120,7 +120,7 @@ impl<'mir, 'tcx> Default for Thread<'mir, 'tcx> {
 
 /// A set of threads.
 #[derive(Debug)]
-pub struct ThreadSet<'mir, 'tcx> {
+pub struct ThreadManager<'mir, 'tcx> {
     /// Identifier of the currently active thread.
     active_thread: ThreadId,
     /// Threads used in the program.
@@ -131,7 +131,7 @@ pub struct ThreadSet<'mir, 'tcx> {
     blockset_counter: u32,
 }
 
-impl<'mir, 'tcx> Default for ThreadSet<'mir, 'tcx> {
+impl<'mir, 'tcx> Default for ThreadManager<'mir, 'tcx> {
     fn default() -> Self {
         let mut threads = IndexVec::new();
         threads.push(Default::default());
@@ -139,7 +139,7 @@ impl<'mir, 'tcx> Default for ThreadSet<'mir, 'tcx> {
     }
 }
 
-impl<'mir, 'tcx: 'mir> ThreadSet<'mir, 'tcx> {
+impl<'mir, 'tcx: 'mir> ThreadManager<'mir, 'tcx> {
     /// Borrow the stack of the active thread.
     fn active_thread_stack(&self) -> &[Frame<'mir, 'tcx, Tag, FrameData<'tcx>>] {
         &self.threads[self.active_thread].stack