diff --git a/auxil/broker b/auxil/broker
index 3c00df399e..a7d92926db 160000
--- a/auxil/broker
+++ b/auxil/broker
@@ -1 +1 @@
-Subproject commit 3c00df399e05d70b2aefdeb8fef6b47f08d0b289
+Subproject commit a7d92926dbfcd4577ddf2d8fee2ef9d7dfe60837
diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index 29e38795ca..e61f8b6421 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -139,8 +139,8 @@ class BrokerState {
 public:
 	BrokerState(BrokerConfig config, size_t congestion_queue_size)
 		: endpoint(std::move(config)),
-		  subscriber(endpoint.make_subscriber({broker::topics::statuses,
-		                                       broker::topics::errors},
+		  subscriber(endpoint.make_subscriber({broker::topic::statuses(),
+		                                       broker::topic::errors()},
 		                                      congestion_queue_size))
 		{
 		}
@@ -382,7 +382,7 @@ void Manager::InitPostScript()
 	if ( ! iosource_mgr->RegisterFd(bstate->subscriber.fd(), this) )
 		reporter->FatalError("Failed to register broker subscriber with iosource_mgr");
 
-	bstate->subscriber.add_topic(broker::topics::store_events, true);
+	bstate->subscriber.add_topic(broker::topic::store_events(), true);
 
 	InitializeBrokerStoreForwarding();
 	}
@@ -1094,7 +1094,7 @@ void Manager::Process()
 		{
 		auto& topic = broker::get_topic(message);
 
-		if ( broker::topics::statuses.prefix_of(topic) )
+		if ( broker::is_prefix(topic, broker::topic::statuses_str) )
 			{
 			if ( auto stat = broker::make_status_view(get_data(message)) )
 				{
@@ -1109,7 +1109,7 @@ void Manager::Process()
 			continue;
 			}
 
-		if ( broker::topics::errors.prefix_of(topic) )
+		if ( broker::is_prefix(topic, broker::topic::errors_str) )
 			{
 			if ( auto err = broker::make_error_view(get_data(message)) )
 				{
@@ -1124,7 +1124,7 @@ void Manager::Process()
 			continue;
 			}
 
-		if ( broker::topics::store_events.prefix_of(topic) )
+		if ( broker::is_prefix(topic, broker::topic::store_events_str) )
 			{
 			ProcessStoreEvent(broker::move_data(message));
 			continue;