diff --git a/code/Cargo.lock b/code/Cargo.lock
index 9dd3833aa..a8e8cdb80 100644
--- a/code/Cargo.lock
+++ b/code/Cargo.lock
@@ -2749,31 +2749,6 @@ dependencies = [
  "twox-hash",
 ]
 
-[[package]]
-name = "malachite-actors"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "byteorder",
- "bytes",
- "derive-where",
- "eyre",
- "libp2p",
- "malachite-codec",
- "malachite-config",
- "malachite-consensus",
- "malachite-core-types",
- "malachite-metrics",
- "malachite-network",
- "malachite-sync",
- "malachite-test-mempool",
- "malachite-wal",
- "ractor",
- "rand",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "malachite-app"
 version = "0.1.0"
@@ -2781,11 +2756,11 @@ dependencies = [
  "async-trait",
  "eyre",
  "libp2p-identity",
- "malachite-actors",
  "malachite-codec",
  "malachite-config",
  "malachite-consensus",
  "malachite-core-types",
+ "malachite-engine",
  "malachite-metrics",
  "malachite-network",
  "malachite-peer",
@@ -2802,8 +2777,8 @@ dependencies = [
  "bytes",
  "derive-where",
  "eyre",
- "malachite-actors",
  "malachite-app",
+ "malachite-engine",
  "malachite-test",
  "ractor",
  "rand",
@@ -2954,6 +2929,31 @@ dependencies = [
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "malachite-engine"
+version = "0.1.0"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "bytes",
+ "derive-where",
+ "eyre",
+ "libp2p",
+ "malachite-codec",
+ "malachite-config",
+ "malachite-consensus",
+ "malachite-core-types",
+ "malachite-metrics",
+ "malachite-network",
+ "malachite-sync",
+ "malachite-test-mempool",
+ "malachite-wal",
+ "ractor",
+ "rand",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "malachite-metrics"
 version = "0.1.0"
@@ -3043,13 +3043,13 @@ dependencies = [
  "eyre",
  "itertools 0.13.0",
  "libp2p-identity",
- "malachite-actors",
  "malachite-app",
  "malachite-cli",
  "malachite-codec",
  "malachite-config",
  "malachite-consensus",
  "malachite-core-types",
+ "malachite-engine",
  "malachite-metrics",
  "malachite-network",
  "malachite-node",
@@ -3101,10 +3101,10 @@ dependencies = [
  "axum",
  "bytesize",
  "eyre",
- "malachite-actors",
  "malachite-config",
  "malachite-consensus",
  "malachite-core-types",
+ "malachite-engine",
  "malachite-metrics",
  "malachite-starknet-host",
  "ractor",
@@ -3145,12 +3145,12 @@ dependencies = [
  "ed25519-consensus",
  "eyre",
  "hex",
- "malachite-actors",
  "malachite-app",
  "malachite-codec",
  "malachite-config",
  "malachite-consensus",
  "malachite-core-types",
+ "malachite-engine",
  "malachite-proto",
  "malachite-signing-ed25519",
  "malachite-sync",
diff --git a/code/Cargo.toml b/code/Cargo.toml
index d01752533..38d9799ab 100644
--- a/code/Cargo.toml
+++ b/code/Cargo.toml
@@ -2,7 +2,6 @@
 resolver = "2"
 
 members = [
-  "crates/actors",
   "crates/app",
   "crates/app-channel",
   "crates/cli",
@@ -13,6 +12,7 @@ members = [
   "crates/core-state-machine",
   "crates/core-types",
   "crates/core-votekeeper",
+  "crates/engine",
   "crates/metrics",
   "crates/network",
   "crates/node",
@@ -59,7 +59,7 @@ debug = true
 # None for now
 
 [workspace.dependencies]
-malachite-actors             = { version = "0.1.0", path = "crates/actors" }
+malachite-engine             = { version = "0.1.0", path = "crates/engine" }
 malachite-app                = { version = "0.1.0", path = "crates/app" }
 malachite-app-channel        = { version = "0.1.0", path = "crates/app-channel" }
 malachite-cli                = { version = "0.1.0", path = "crates/cli" }
diff --git a/code/crates/app-channel/Cargo.toml b/code/crates/app-channel/Cargo.toml
index 5514eea90..d577b288a 100644
--- a/code/crates/app-channel/Cargo.toml
+++ b/code/crates/app-channel/Cargo.toml
@@ -16,7 +16,7 @@ tokio.workspace = true
 tracing.workspace = true
 
 malachite-app.workspace = true
-malachite-actors.workspace = true
+malachite-engine.workspace = true
 
 [lints]
 workspace = true
diff --git a/code/crates/app-channel/src/channel.rs b/code/crates/app-channel/src/channel.rs
index c68ef7b38..04a0ef60a 100644
--- a/code/crates/app-channel/src/channel.rs
+++ b/code/crates/app-channel/src/channel.rs
@@ -88,7 +88,7 @@ pub enum ConsensusMsg<Ctx: Context> {
     StartHeight(Ctx::Height, Ctx::ValidatorSet),
 }
 
-use malachite_actors::consensus::Msg as ConsensusActorMsg;
+use malachite_engine::consensus::Msg as ConsensusActorMsg;
 
 impl<Ctx: Context> From<ConsensusMsg<Ctx>> for ConsensusActorMsg<Ctx> {
     fn from(msg: ConsensusMsg<Ctx>) -> ConsensusActorMsg<Ctx> {
diff --git a/code/crates/app-channel/src/connector.rs b/code/crates/app-channel/src/connector.rs
index e5082c100..6a8186bad 100644
--- a/code/crates/app-channel/src/connector.rs
+++ b/code/crates/app-channel/src/connector.rs
@@ -4,7 +4,7 @@ use ractor::{async_trait, Actor, ActorProcessingErr, ActorRef, SpawnErr};
 use tokio::sync::mpsc;
 use tokio::sync::oneshot;
 
-use malachite_actors::host::HostMsg;
+use malachite_engine::host::HostMsg;
 
 use crate::app::types::core::Context;
 use crate::app::types::metrics::Metrics;
diff --git a/code/crates/app-channel/src/run.rs b/code/crates/app-channel/src/run.rs
index a733bad1f..9c6cc4fd3 100644
--- a/code/crates/app-channel/src/run.rs
+++ b/code/crates/app-channel/src/run.rs
@@ -12,10 +12,10 @@ use crate::app::types::metrics::{Metrics, SharedRegistry};
 use crate::channel::AppMsg;
 use crate::spawn::spawn_host_actor;
 
-use malachite_actors::util::events::TxEvent;
 use malachite_app::{
     spawn_consensus_actor, spawn_network_actor, spawn_sync_actor, spawn_wal_actor,
 };
+use malachite_engine::util::events::TxEvent;
 
 #[tracing::instrument("node", skip_all, fields(moniker = %cfg.moniker))]
 pub async fn run<Node, Ctx, Codec>(
diff --git a/code/crates/app-channel/src/spawn.rs b/code/crates/app-channel/src/spawn.rs
index 58cbd2174..b76871048 100644
--- a/code/crates/app-channel/src/spawn.rs
+++ b/code/crates/app-channel/src/spawn.rs
@@ -3,7 +3,7 @@
 use eyre::Result;
 use tokio::sync::mpsc;
 
-use malachite_actors::host::HostRef;
+use malachite_engine::host::HostRef;
 
 use crate::app::types::core::Context;
 use crate::app::types::metrics::Metrics;
diff --git a/code/crates/app/Cargo.toml b/code/crates/app/Cargo.toml
index 2e1f1a0ff..7222c4855 100644
--- a/code/crates/app/Cargo.toml
+++ b/code/crates/app/Cargo.toml
@@ -8,7 +8,7 @@ publish.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-malachite-actors.workspace = true
+malachite-engine.workspace = true
 malachite-codec.workspace = true
 malachite-core-types.workspace = true
 malachite-config.workspace = true
diff --git a/code/crates/app/src/spawn.rs b/code/crates/app/src/spawn.rs
index 75e81aa44..ff34f68be 100644
--- a/code/crates/app/src/spawn.rs
+++ b/code/crates/app/src/spawn.rs
@@ -6,12 +6,12 @@ use std::time::Duration;
 use eyre::Result;
 use tracing::Span;
 
-use malachite_actors::consensus::{Consensus, ConsensusCodec, ConsensusParams, ConsensusRef};
-use malachite_actors::host::HostRef;
-use malachite_actors::network::{Network, NetworkRef};
-use malachite_actors::sync::{Params as SyncParams, Sync, SyncCodec, SyncRef};
-use malachite_actors::util::events::TxEvent;
-use malachite_actors::wal::{Wal, WalCodec, WalRef};
+use malachite_engine::consensus::{Consensus, ConsensusCodec, ConsensusParams, ConsensusRef};
+use malachite_engine::host::HostRef;
+use malachite_engine::network::{Network, NetworkRef};
+use malachite_engine::sync::{Params as SyncParams, Sync, SyncCodec, SyncRef};
+use malachite_engine::util::events::TxEvent;
+use malachite_engine::wal::{Wal, WalCodec, WalRef};
 use malachite_network::{Config as NetworkConfig, DiscoveryConfig, GossipSubConfig, Keypair};
 
 use crate::types::config::{Config as NodeConfig, PubSubProtocol, SyncConfig, TransportProtocol};
diff --git a/code/crates/app/src/types.rs b/code/crates/app/src/types.rs
index b8721c3c3..5fa6bc4f6 100644
--- a/code/crates/app/src/types.rs
+++ b/code/crates/app/src/types.rs
@@ -1,7 +1,7 @@
 //! Re-export of all types required to build a Malachite application.
 
-pub use malachite_actors::host::LocallyProposedValue;
 pub use malachite_consensus::{ConsensusMsg, ProposedValue, SignedConsensusMsg, ValuePayload};
+pub use malachite_engine::host::LocallyProposedValue;
 pub use malachite_peer::PeerId;
 
 pub mod core {
@@ -19,7 +19,7 @@ pub mod metrics {
 pub use libp2p_identity::Keypair;
 
 pub mod streaming {
-    pub use malachite_actors::util::streaming::StreamMessage;
+    pub use malachite_engine::util::streaming::StreamMessage;
 }
 
 pub mod sync {
@@ -27,8 +27,8 @@ pub mod sync {
 }
 
 pub mod codec {
-    pub use malachite_actors::consensus::ConsensusCodec;
-    pub use malachite_actors::sync::SyncCodec;
-    pub use malachite_actors::wal::WalCodec;
     pub use malachite_codec::Codec;
+    pub use malachite_engine::consensus::ConsensusCodec;
+    pub use malachite_engine::sync::SyncCodec;
+    pub use malachite_engine::wal::WalCodec;
 }
diff --git a/code/crates/actors/Cargo.toml b/code/crates/engine/Cargo.toml
similarity index 97%
rename from code/crates/actors/Cargo.toml
rename to code/crates/engine/Cargo.toml
index 4fc8708ac..9851983ee 100644
--- a/code/crates/actors/Cargo.toml
+++ b/code/crates/engine/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "malachite-actors"
+name = "malachite-engine"
 version.workspace = true
 edition.workspace = true
 repository.workspace = true
diff --git a/code/crates/actors/src/consensus.rs b/code/crates/engine/src/consensus.rs
similarity index 100%
rename from code/crates/actors/src/consensus.rs
rename to code/crates/engine/src/consensus.rs
diff --git a/code/crates/actors/src/host.rs b/code/crates/engine/src/host.rs
similarity index 100%
rename from code/crates/actors/src/host.rs
rename to code/crates/engine/src/host.rs
diff --git a/code/crates/actors/src/lib.rs b/code/crates/engine/src/lib.rs
similarity index 100%
rename from code/crates/actors/src/lib.rs
rename to code/crates/engine/src/lib.rs
diff --git a/code/crates/actors/src/network.rs b/code/crates/engine/src/network.rs
similarity index 100%
rename from code/crates/actors/src/network.rs
rename to code/crates/engine/src/network.rs
diff --git a/code/crates/actors/src/node.rs b/code/crates/engine/src/node.rs
similarity index 100%
rename from code/crates/actors/src/node.rs
rename to code/crates/engine/src/node.rs
diff --git a/code/crates/actors/src/sync.rs b/code/crates/engine/src/sync.rs
similarity index 100%
rename from code/crates/actors/src/sync.rs
rename to code/crates/engine/src/sync.rs
diff --git a/code/crates/actors/src/util/events.rs b/code/crates/engine/src/util/events.rs
similarity index 100%
rename from code/crates/actors/src/util/events.rs
rename to code/crates/engine/src/util/events.rs
diff --git a/code/crates/actors/src/util/mod.rs b/code/crates/engine/src/util/mod.rs
similarity index 100%
rename from code/crates/actors/src/util/mod.rs
rename to code/crates/engine/src/util/mod.rs
diff --git a/code/crates/actors/src/util/streaming.rs b/code/crates/engine/src/util/streaming.rs
similarity index 100%
rename from code/crates/actors/src/util/streaming.rs
rename to code/crates/engine/src/util/streaming.rs
diff --git a/code/crates/actors/src/util/ticker.rs b/code/crates/engine/src/util/ticker.rs
similarity index 100%
rename from code/crates/actors/src/util/ticker.rs
rename to code/crates/engine/src/util/ticker.rs
diff --git a/code/crates/actors/src/util/timers.rs b/code/crates/engine/src/util/timers.rs
similarity index 100%
rename from code/crates/actors/src/util/timers.rs
rename to code/crates/engine/src/util/timers.rs
diff --git a/code/crates/actors/src/wal.rs b/code/crates/engine/src/wal.rs
similarity index 100%
rename from code/crates/actors/src/wal.rs
rename to code/crates/engine/src/wal.rs
diff --git a/code/crates/actors/src/wal/entry.rs b/code/crates/engine/src/wal/entry.rs
similarity index 100%
rename from code/crates/actors/src/wal/entry.rs
rename to code/crates/engine/src/wal/entry.rs
diff --git a/code/crates/actors/src/wal/thread.rs b/code/crates/engine/src/wal/thread.rs
similarity index 100%
rename from code/crates/actors/src/wal/thread.rs
rename to code/crates/engine/src/wal/thread.rs
diff --git a/code/crates/node/src/lib.rs b/code/crates/node/src/lib.rs
index 8a353a0e3..3718f9c99 100644
--- a/code/crates/node/src/lib.rs
+++ b/code/crates/node/src/lib.rs
@@ -1 +1 @@
-// Empty for now, will eventually contain the `malachite-actors` crate
+// Empty for now, will eventually contain the `malachite-engine` crate
diff --git a/code/crates/starknet/host/Cargo.toml b/code/crates/starknet/host/Cargo.toml
index d23c5daff..ec31f831b 100644
--- a/code/crates/starknet/host/Cargo.toml
+++ b/code/crates/starknet/host/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name                   = "malachite-starknet-host"
-version.workspace      = true
-edition.workspace      = true
-repository.workspace   = true
-license.workspace      = true
+name = "malachite-starknet-host"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 rust-version.workspace = true
-publish                = false
+publish = false
 
 [dependencies]
-malachite-actors = { workspace = true }
+malachite-engine = { workspace = true }
 malachite-app = { workspace = true }
 malachite-codec = { workspace = true }
 malachite-config = { workspace = true }
diff --git a/code/crates/starknet/host/src/actor.rs b/code/crates/starknet/host/src/actor.rs
index e89367cb1..50135ac8a 100644
--- a/code/crates/starknet/host/src/actor.rs
+++ b/code/crates/starknet/host/src/actor.rs
@@ -10,12 +10,12 @@ use rand::SeedableRng;
 use tokio::time::Instant;
 use tracing::{debug, error, info, trace, warn};
 
-use malachite_actors::consensus::{ConsensusMsg, ConsensusRef};
-use malachite_actors::host::{LocallyProposedValue, ProposedValue};
-use malachite_actors::network::{NetworkMsg, NetworkRef};
-use malachite_actors::util::streaming::{StreamContent, StreamMessage};
 use malachite_consensus::PeerId;
 use malachite_core_types::{CommitCertificate, Round, Validity, ValueOrigin};
+use malachite_engine::consensus::{ConsensusMsg, ConsensusRef};
+use malachite_engine::host::{LocallyProposedValue, ProposedValue};
+use malachite_engine::network::{NetworkMsg, NetworkRef};
+use malachite_engine::util::streaming::{StreamContent, StreamMessage};
 use malachite_metrics::Metrics;
 use malachite_sync::DecidedValue;
 
@@ -33,8 +33,8 @@ pub struct Host {
     span: tracing::Span,
 }
 
-pub type HostRef = malachite_actors::host::HostRef<MockContext>;
-pub type HostMsg = malachite_actors::host::HostMsg<MockContext>;
+pub type HostRef = malachite_engine::host::HostRef<MockContext>;
+pub type HostMsg = malachite_engine::host::HostMsg<MockContext>;
 
 impl Host {
     pub async fn spawn(
diff --git a/code/crates/starknet/host/src/codec.rs b/code/crates/starknet/host/src/codec.rs
index c1bc73fa3..0a7c448c7 100644
--- a/code/crates/starknet/host/src/codec.rs
+++ b/code/crates/starknet/host/src/codec.rs
@@ -1,12 +1,12 @@
 use bytes::Bytes;
 use prost::Message;
 
-use malachite_actors::util::streaming::{StreamContent, StreamMessage};
 use malachite_codec::Codec;
 use malachite_core_types::{
     AggregatedSignature, CommitCertificate, CommitSignature, Extension, Round, SignedExtension,
     SignedProposal, SignedVote, Validity,
 };
+use malachite_engine::util::streaming::{StreamContent, StreamMessage};
 use malachite_sync::{self as sync, ValueRequest, ValueResponse, VoteSetRequest, VoteSetResponse};
 
 use malachite_consensus::{PeerId, ProposedValue, SignedConsensusMsg};
diff --git a/code/crates/starknet/host/src/host/state.rs b/code/crates/starknet/host/src/host/state.rs
index a47dda369..498598e65 100644
--- a/code/crates/starknet/host/src/host/state.rs
+++ b/code/crates/starknet/host/src/host/state.rs
@@ -5,10 +5,10 @@ use rand::RngCore;
 use sha3::Digest;
 use tracing::{debug, error, trace};
 
-use malachite_actors::consensus::ConsensusRef;
-use malachite_actors::host::ProposedValue;
-use malachite_actors::util::streaming::StreamId;
 use malachite_core_types::{Round, SignedExtension, Validity};
+use malachite_engine::consensus::ConsensusRef;
+use malachite_engine::host::ProposedValue;
+use malachite_engine::util::streaming::StreamId;
 
 use crate::block_store::BlockStore;
 use crate::host::proposal::compute_proposal_hash;
diff --git a/code/crates/starknet/host/src/node.rs b/code/crates/starknet/host/src/node.rs
index 8ed6ec042..db6558e45 100644
--- a/code/crates/starknet/host/src/node.rs
+++ b/code/crates/starknet/host/src/node.rs
@@ -6,11 +6,11 @@ use rand::{CryptoRng, RngCore};
 use serde::{Deserialize, Serialize};
 use tracing::{info, Instrument};
 
-use malachite_actors::util::events::TxEvent;
 use malachite_app::types::Keypair;
 use malachite_app::Node;
 use malachite_config::Config;
 use malachite_core_types::VotingPower;
+use malachite_engine::util::events::TxEvent;
 
 use crate::spawn::spawn_node_actor;
 use crate::types::Height;
diff --git a/code/crates/starknet/host/src/spawn.rs b/code/crates/starknet/host/src/spawn.rs
index d99d3351e..3462f8dba 100644
--- a/code/crates/starknet/host/src/spawn.rs
+++ b/code/crates/starknet/host/src/spawn.rs
@@ -2,19 +2,19 @@ use std::path::{Path, PathBuf};
 use std::time::Duration;
 
 use libp2p_identity::ecdsa;
-use malachite_actors::util::events::TxEvent;
-use malachite_actors::wal::{Wal, WalRef};
+use malachite_engine::util::events::TxEvent;
+use malachite_engine::wal::{Wal, WalRef};
 use tokio::task::JoinHandle;
 
-use malachite_actors::consensus::{Consensus, ConsensusParams, ConsensusRef};
-use malachite_actors::host::HostRef;
-use malachite_actors::network::{Network, NetworkRef};
-use malachite_actors::node::{Node, NodeRef};
-use malachite_actors::sync::{Params as SyncParams, Sync, SyncRef};
 use malachite_config::{
     self as config, Config as NodeConfig, MempoolConfig, SyncConfig, TestConfig, TransportProtocol,
 };
 use malachite_consensus::ValuePayload;
+use malachite_engine::consensus::{Consensus, ConsensusParams, ConsensusRef};
+use malachite_engine::host::HostRef;
+use malachite_engine::network::{Network, NetworkRef};
+use malachite_engine::node::{Node, NodeRef};
+use malachite_engine::sync::{Params as SyncParams, Sync, SyncRef};
 use malachite_metrics::Metrics;
 use malachite_metrics::SharedRegistry;
 use malachite_network::Keypair;
diff --git a/code/crates/starknet/host/src/streaming.rs b/code/crates/starknet/host/src/streaming.rs
index 1ba3fa7e6..1306479d6 100644
--- a/code/crates/starknet/host/src/streaming.rs
+++ b/code/crates/starknet/host/src/streaming.rs
@@ -3,9 +3,9 @@ use std::collections::{BTreeMap, BinaryHeap, HashSet};
 
 use derive_where::derive_where;
 
-use malachite_actors::util::streaming::{Sequence, StreamId, StreamMessage};
 use malachite_consensus::PeerId;
 use malachite_core_types::Round;
+use malachite_engine::util::streaming::{Sequence, StreamId, StreamMessage};
 
 use crate::types::{Address, Height, ProposalInit, ProposalPart};
 
diff --git a/code/crates/starknet/test/Cargo.toml b/code/crates/starknet/test/Cargo.toml
index 6e73ecf7f..dcb9f99db 100644
--- a/code/crates/starknet/test/Cargo.toml
+++ b/code/crates/starknet/test/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name                   = "malachite-starknet-test"
-version.workspace      = true
-edition.workspace      = true
-repository.workspace   = true
-license.workspace      = true
+name = "malachite-starknet-test"
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 rust-version.workspace = true
-publish                = false
+publish = false
 
 [dependencies]
-malachite-actors.workspace = true
+malachite-engine.workspace = true
 malachite-core-types.workspace = true
 malachite-config.workspace = true
 malachite-consensus.workspace = true
diff --git a/code/crates/starknet/test/src/lib.rs b/code/crates/starknet/test/src/lib.rs
index c3a9c1e70..1ef3666dd 100644
--- a/code/crates/starknet/test/src/lib.rs
+++ b/code/crates/starknet/test/src/lib.rs
@@ -13,13 +13,13 @@ use tokio::task::JoinSet;
 use tokio::time::{sleep, Duration};
 use tracing::{debug, error, error_span, info, Instrument, Span};
 
-use malachite_actors::util::events::{Event, RxEvent, TxEvent};
 use malachite_config::{
     Config as NodeConfig, Config, DiscoveryConfig, LoggingConfig, PubSubProtocol, SyncConfig,
     TestConfig, TransportProtocol,
 };
 use malachite_consensus::{SignedConsensusMsg, ValueToPropose};
 use malachite_core_types::{SignedVote, VotingPower};
+use malachite_engine::util::events::{Event, RxEvent, TxEvent};
 use malachite_starknet_host::spawn::spawn_node_actor;
 use malachite_starknet_host::types::MockContext;
 use malachite_starknet_host::types::{Height, PrivateKey, Validator, ValidatorSet};
diff --git a/code/crates/starknet/test/tests/wal.rs b/code/crates/starknet/test/tests/wal.rs
index 6880594d0..76607710e 100644
--- a/code/crates/starknet/test/tests/wal.rs
+++ b/code/crates/starknet/test/tests/wal.rs
@@ -3,10 +3,10 @@ use std::time::Duration;
 use eyre::bail;
 use tracing::info;
 
-use malachite_actors::util::events::Event;
 use malachite_config::ValuePayload;
 use malachite_consensus::ValueToPropose;
 use malachite_core_types::SignedVote;
+use malachite_engine::util::events::Event;
 use malachite_starknet_host::types::MockContext;
 use malachite_starknet_test::{init_logging, HandlerResult, TestBuilder, TestParams};
 
diff --git a/code/crates/test/Cargo.toml b/code/crates/test/Cargo.toml
index a11fcff6e..05f12413b 100644
--- a/code/crates/test/Cargo.toml
+++ b/code/crates/test/Cargo.toml
@@ -1,38 +1,38 @@
 [package]
-name        = "malachite-test"
+name = "malachite-test"
 description = "Testing framework for the Malachite consensus engine"
-publish     = false
+publish = false
 
-version.workspace      = true
-edition.workspace      = true
-repository.workspace   = true
-license.workspace      = true
+version.workspace = true
+edition.workspace = true
+repository.workspace = true
+license.workspace = true
 rust-version.workspace = true
 
 [dependencies]
-malachite-actors          = { workspace = true }
-malachite-app             = { workspace = true }
-malachite-codec           = { workspace = true }
-malachite-core-types          = { workspace = true }
-malachite-config          = { workspace = true }
-malachite-consensus       = { workspace = true }
-malachite-proto           = { workspace = true }
+malachite-engine = { workspace = true }
+malachite-app = { workspace = true }
+malachite-codec = { workspace = true }
+malachite-core-types = { workspace = true }
+malachite-config = { workspace = true }
+malachite-consensus = { workspace = true }
+malachite-proto = { workspace = true }
 malachite-signing-ed25519 = { workspace = true, features = ["rand", "serde"] }
-malachite-sync            = { workspace = true }
+malachite-sync = { workspace = true }
 
-async-trait        = { workspace = true }
-base64             = { workspace = true }
-bytes              = { workspace = true }
-ed25519-consensus  = { workspace = true }
-eyre               = { workspace = true }
-hex                = { workspace = true }
-prost              = { workspace = true }
-prost-types        = { workspace = true }
-rand               = { workspace = true }
-serde              = { workspace = true, features = ["derive", "rc"] }
-serde_json         = { workspace = true }
-sha3               = { workspace = true }
-signature          = { workspace = true }
+async-trait = { workspace = true }
+base64 = { workspace = true }
+bytes = { workspace = true }
+ed25519-consensus = { workspace = true }
+eyre = { workspace = true }
+hex = { workspace = true }
+prost = { workspace = true }
+prost-types = { workspace = true }
+rand = { workspace = true }
+serde = { workspace = true, features = ["derive", "rc"] }
+serde_json = { workspace = true }
+sha3 = { workspace = true }
+signature = { workspace = true }
 
 [build-dependencies]
 prost-build = { workspace = true }
diff --git a/code/crates/test/src/codec/testcodec.rs b/code/crates/test/src/codec/testcodec.rs
index f1d1bcfec..5d643b371 100644
--- a/code/crates/test/src/codec/testcodec.rs
+++ b/code/crates/test/src/codec/testcodec.rs
@@ -5,8 +5,8 @@ use crate::codec::types::{
     RawRequest, RawResponse, RawSignedConsensusMsg, RawStatus, RawStreamMessage,
 };
 use crate::{ProposalPart, TestContext};
-use malachite_actors::util::streaming::StreamMessage;
 use malachite_consensus::SignedConsensusMsg;
+use malachite_engine::util::streaming::StreamMessage;
 use malachite_sync::{Request, Response, Status};
 
 pub struct TestCodec;
diff --git a/code/crates/test/src/codec/types.rs b/code/crates/test/src/codec/types.rs
index b8bcf13f1..bf7d9bb62 100644
--- a/code/crates/test/src/codec/types.rs
+++ b/code/crates/test/src/codec/types.rs
@@ -1,12 +1,12 @@
 use crate::{Address, Height, Proposal, ProposalPart, RoundDef, TestContext, ValueId, Vote};
 use bytes::Bytes;
 use ed25519_consensus::Signature;
-use malachite_actors::util::streaming::{StreamContent, StreamMessage};
 use malachite_consensus::SignedConsensusMsg;
 use malachite_core_types::{
     AggregatedSignature, CommitCertificate, CommitSignature, Extension, Round, SignedExtension,
     SignedProposal, SignedVote, VoteSet,
 };
+use malachite_engine::util::streaming::{StreamContent, StreamMessage};
 use malachite_proto::Protobuf;
 use malachite_sync::{
     DecidedValue, PeerId, Request, Response, Status, ValueRequest, ValueResponse, VoteSetRequest,