diff --git a/src/solanaceae/message3/components.hpp b/src/solanaceae/message3/components.hpp
index 1d5ece3..b7beaf8 100644
--- a/src/solanaceae/message3/components.hpp
+++ b/src/solanaceae/message3/components.hpp
@@ -45,23 +45,19 @@ namespace Message::Components {
 	};
 	// local end
 
-	namespace Remote {
-		// TODO: milliseconds sound excessive
+	// TODO: milliseconds sound excessive
+	struct ReceivedBy {
+		// Due to a lack of info with some protocols,
+		// this is often the timestamp we heard they already have the message.
+		entt::dense_map<Contact3, uint64_t> ts;
+	};
 
-		struct TimestampReceived {
-			// Due to a lack of info with most protocols,
-			// this is often the timestamp we heard they already have the message.
-			entt::dense_map<Contact3, uint64_t> ts;
-		};
-
-		struct TimestampRead {
-			// Due to a lack of info with most protocols,
-			// this is often the timestamp we heard they have read it the message.
-			entt::dense_map<Contact3, uint64_t> ts;
-		};
-
-	} // Remote
+	struct ReadBy {
+		entt::dense_map<Contact3, uint64_t> ts;
+	};
 
+	// similar to ReceivedBy, but only set when they sent the message
+	// (efficent protocols have 1 contact in here)
 	struct SyncedBy {
 		// ts is not updated once set
 		entt::dense_map<Contact3, uint64_t> ts;
diff --git a/src/solanaceae/message3/components_id.inl b/src/solanaceae/message3/components_id.inl
index 174f53e..93c66ee 100644
--- a/src/solanaceae/message3/components_id.inl
+++ b/src/solanaceae/message3/components_id.inl
@@ -25,8 +25,8 @@ DEFINE_COMP_ID(Message::Components::TimestampProcessed)
 DEFINE_COMP_ID(Message::Components::TimestampWritten)
 DEFINE_COMP_ID(Message::Components::TagUnread)
 DEFINE_COMP_ID(Message::Components::Read)
-DEFINE_COMP_ID(Message::Components::Remote::TimestampReceived)
-DEFINE_COMP_ID(Message::Components::Remote::TimestampRead)
+DEFINE_COMP_ID(Message::Components::ReceivedBy)
+DEFINE_COMP_ID(Message::Components::ReadBy)
 DEFINE_COMP_ID(Message::Components::SyncedBy)
 DEFINE_COMP_ID(Message::Components::MessageText)
 DEFINE_COMP_ID(Message::Components::TagMessageIsAction)