diff --git a/src/runtime2/native.rs b/src/runtime2/native.rs
index 0b6b5fdaf98b09d9f591a2b2b7cbe80e438e1b25..daeeff3c14f8cef0346939cb005260948010bd11 100644
--- a/src/runtime2/native.rs
+++ b/src/runtime2/native.rs
@@ -6,11 +6,11 @@ use crate::protocol::ComponentCreationError;
 use crate::protocol::eval::ValueGroup;
 
 use super::{ConnectorKey, ConnectorId, RuntimeInner};
-use super::scheduler::{SchedulerCtx, ComponentCtxFancy};
+use super::scheduler::{SchedulerCtx, ComponentCtx};
 use super::port::{Port, PortIdLocal, Channel, PortKind};
 use super::consensus::find_ports_in_value_group;
-use super::connector2::{ConnectorScheduling, ConnectorPDL};
-use super::inbox2::{MessageFancy, ControlContent, ControlMessageFancy};
+use super::connector::{ConnectorScheduling, ConnectorPDL};
+use super::inbox::{Message, ControlContent, ControlMessage};
 
 /// Generic connector interface from the scheduler's point of view.
 pub(crate) trait Connector {
@@ -18,7 +18,7 @@ pub(crate) trait Connector {
     /// One should generally request and handle new messages from the component
     /// context. Then perform any logic the component has to do, and in the
     /// process perhaps queue up some state changes using the same context.
-    fn run(&mut self, sched_ctx: SchedulerCtx, comp_ctx: &mut ComponentCtxFancy) -> ConnectorScheduling;
+    fn run(&mut self, sched_ctx: SchedulerCtx, comp_ctx: &mut ComponentCtx) -> ConnectorScheduling;
 }
 
 type SyncDone = Arc<(Mutex<bool>, Condvar)>;
@@ -53,13 +53,13 @@ impl ConnectorApplication {
 }
 
 impl Connector for ConnectorApplication {
-    fn run(&mut self, _sched_ctx: SchedulerCtx, comp_ctx: &mut ComponentCtxFancy) -> ConnectorScheduling {
+    fn run(&mut self, _sched_ctx: SchedulerCtx, comp_ctx: &mut ComponentCtx) -> ConnectorScheduling {
         // Handle any incoming messages if we're participating in a round
         while let Some(message) = comp_ctx.read_next_message() {
             match message {
-                MessageFancy::Data(_) => todo!("data message in API connector"),
-                MessageFancy::Sync(_)  => todo!("sync message in API connector"),
-                MessageFancy::Control(_) => todo!("impossible control message"),
+                Message::Data(_) => todo!("data message in API connector"),
+                Message::Sync(_)  => todo!("sync message in API connector"),
+                Message::Control(_) => todo!("impossible control message"),
             }
         }
 
@@ -185,7 +185,7 @@ impl ApplicationInterface {
 
     fn wake_up_connector_with_ping(&self) {
         let connector = self.runtime.get_component_public(self.connector_id);
-        connector.inbox.insert_message(MessageFancy::Control(ControlMessageFancy{
+        connector.inbox.insert_message(Message::Control(ControlMessage {
             id: 0,
             sending_component_id: self.connector_id,
             content: ControlContent::Ping,