diff --git a/include/ircd/m/vm.h b/include/ircd/m/vm.h
index 7f630de2a..3d807888a 100644
--- a/include/ircd/m/vm.h
+++ b/include/ircd/m/vm.h
@@ -216,19 +216,19 @@ struct ircd::m::vm::copts
 :opts
 {
 	/// Hash and include hashes object.
-	bool hash {true};
+	bool add_hash {true};
 
 	/// Sign and include signatures object
-	bool sign {true};
+	bool add_sig {true};
 
 	/// Generate and include event_id
-	bool event_id {true};
+	bool add_event_id {true};
 
 	/// Include our origin
-	bool origin {true};
+	bool add_origin {true};
 
 	/// Include origin_server_ts
-	bool origin_server_ts {true};
+	bool add_origin_server_ts {true};
 
 	/// Whether to log a debug message before commit
 	bool debuglog_precommit {false};
diff --git a/modules/client/rooms/receipt.cc b/modules/client/rooms/receipt.cc
index ba4893311..4c8a61282 100644
--- a/modules/client/rooms/receipt.cc
+++ b/modules/client/rooms/receipt.cc
@@ -113,11 +113,11 @@ commit__m_receipt_m_read(const m::room::id &room_id,
 	};
 
 	m::vm::copts opts;
-	opts.hash = false;
-	opts.sign = false;
-	opts.event_id = false;
-	opts.origin = true;
-	opts.origin_server_ts = false;
+	opts.add_hash = false;
+	opts.add_sig = false;
+	opts.add_event_id = false;
+	opts.add_origin = true;
+	opts.add_origin_server_ts = false;
 	opts.conforming = false;
 	return m::vm::eval
 	{
diff --git a/modules/client/rooms/typing.cc b/modules/client/rooms/typing.cc
index 7c679b4e7..6cdf87b8d 100644
--- a/modules/client/rooms/typing.cc
+++ b/modules/client/rooms/typing.cc
@@ -160,11 +160,11 @@ commit__m_typing(const m::typing &edu)
 	};
 
 	m::vm::copts opts;
-	opts.hash = false;
-	opts.sign = false;
-	opts.event_id = false;
-	opts.origin = true;
-	opts.origin_server_ts = false;
+	opts.add_hash = false;
+	opts.add_sig = false;
+	opts.add_event_id = false;
+	opts.add_origin = true;
+	opts.add_origin_server_ts = false;
 	opts.conforming = false;
 	return m::vm::eval
 	{
diff --git a/modules/vm.cc b/modules/vm.cc
index 74957c9f5..b58f85de5 100644
--- a/modules/vm.cc
+++ b/modules/vm.cc
@@ -312,7 +312,7 @@ ircd::m::vm::eval__commit(eval &eval,
 
 	const json::iov::add_if _origin
 	{
-		event, opts.origin,
+		event, opts.add_origin,
 		{
 			"origin", my_host()
 		}
@@ -320,7 +320,7 @@ ircd::m::vm::eval__commit(eval &eval,
 
 	const json::iov::add_if _origin_server_ts
 	{
-		event, opts.origin_server_ts,
+		event, opts.add_origin_server_ts,
 		{
 			"origin_server_ts", ircd::time<milliseconds>()
 		}
@@ -334,7 +334,7 @@ ircd::m::vm::eval__commit(eval &eval,
 	// event_id
 
 	sha256::buf event_id_hash;
-	if(opts.event_id)
+	if(opts.add_event_id)
 	{
 		const json::iov::push _content
 		{
@@ -350,14 +350,17 @@ ircd::m::vm::eval__commit(eval &eval,
 
 	const string_view event_id
 	{
-		opts.event_id?
+		opts.add_event_id?
 			make_id(event, eval.event_id, event_id_hash):
 			string_view{}
 	};
 
 	const json::iov::add_if _event_id
 	{
-		event, opts.event_id, { "event_id", event_id }
+		event, opts.add_event_id,
+		{
+			"event_id", event_id
+		}
 	};
 
 	// hashes
@@ -365,14 +368,17 @@ ircd::m::vm::eval__commit(eval &eval,
 	char hashes_buf[128];
 	const string_view hashes
 	{
-		opts.hash?
+		opts.add_hash?
 			m::event::hashes(hashes_buf, event, content):
 			string_view{}
 	};
 
 	const json::iov::add_if _hashes
 	{
-		event, opts.hash, { "hashes", hashes }
+		event, opts.add_hash,
+		{
+			"hashes", hashes
+		}
 	};
 
 	// sigs
@@ -380,14 +386,17 @@ ircd::m::vm::eval__commit(eval &eval,
 	char sigs_buf[384];
 	const string_view sigs
 	{
-		opts.sign?
+		opts.add_sig?
 			m::event::signatures(sigs_buf, event, contents):
 			string_view{}
 	};
 
 	const json::iov::add_if _sigs
 	{
-		event, opts.sign, { "signatures",  sigs }
+		event, opts.add_sig,
+		{
+			"signatures",  sigs
+		}
 	};
 
 	const json::iov::push _content