diff --git a/inc/Api/Chat/Tools/EventHealthCheck.php b/inc/Api/Chat/Tools/EventHealthCheck.php
index e461e9a..131e4a7 100644
--- a/inc/Api/Chat/Tools/EventHealthCheck.php
+++ b/inc/Api/Chat/Tools/EventHealthCheck.php
@@ -21,7 +21,7 @@
 class EventHealthCheck extends BaseTool {
 
 	public function __construct() {
-		$this->registerTool( 'chat', 'event_health_check', array( $this, 'getToolDefinition' ) );
+		$this->registerTool( 'event_health_check', array( $this, 'getToolDefinition' ), array( 'chat' ) );
 	}
 
 	public function getToolDefinition(): array {
diff --git a/inc/Api/Chat/Tools/FindBrokenTimezoneEvents.php b/inc/Api/Chat/Tools/FindBrokenTimezoneEvents.php
index 9ebdf59..ecb3dd1 100644
--- a/inc/Api/Chat/Tools/FindBrokenTimezoneEvents.php
+++ b/inc/Api/Chat/Tools/FindBrokenTimezoneEvents.php
@@ -20,7 +20,7 @@
 class FindBrokenTimezoneEvents extends BaseTool {
 
 	public function __construct() {
-		$this->registerTool( 'chat', 'find_broken_timezone_events', array( $this, 'getToolDefinition' ) );
+		$this->registerTool( 'find_broken_timezone_events', array( $this, 'getToolDefinition' ), array( 'chat' ) );
 	}
 
 	public function getToolDefinition(): array {
diff --git a/inc/Api/Chat/Tools/FixEventTimezone.php b/inc/Api/Chat/Tools/FixEventTimezone.php
index 7ef66a2..a065a4b 100644
--- a/inc/Api/Chat/Tools/FixEventTimezone.php
+++ b/inc/Api/Chat/Tools/FixEventTimezone.php
@@ -20,7 +20,7 @@
 class FixEventTimezone extends BaseTool {
 
 	public function __construct() {
-		$this->registerTool( 'chat', 'fix_event_timezone', array( $this, 'getToolDefinition' ) );
+		$this->registerTool( 'fix_event_timezone', array( $this, 'getToolDefinition' ), array( 'chat' ) );
 	}
 
 	public function getToolDefinition(): array {
diff --git a/inc/Api/Chat/Tools/GetVenueEvents.php b/inc/Api/Chat/Tools/GetVenueEvents.php
index 562e66a..d8affa3 100644
--- a/inc/Api/Chat/Tools/GetVenueEvents.php
+++ b/inc/Api/Chat/Tools/GetVenueEvents.php
@@ -20,7 +20,7 @@
 class GetVenueEvents extends BaseTool {
 
 	public function __construct() {
-		$this->registerTool( 'chat', 'get_venue_events', array( $this, 'getToolDefinition' ) );
+		$this->registerTool( 'get_venue_events', array( $this, 'getToolDefinition' ), array( 'chat' ) );
 	}
 
 	public function getToolDefinition(): array {
diff --git a/inc/Api/Chat/Tools/TestEventScraper.php b/inc/Api/Chat/Tools/TestEventScraper.php
index 620dd0e..a61c93c 100644
--- a/inc/Api/Chat/Tools/TestEventScraper.php
+++ b/inc/Api/Chat/Tools/TestEventScraper.php
@@ -20,7 +20,7 @@
 class TestEventScraper extends BaseTool {
 
 	public function __construct() {
-		$this->registerTool( 'chat', 'test_event_scraper', array( $this, 'getToolDefinition' ) );
+		$this->registerTool( 'test_event_scraper', array( $this, 'getToolDefinition' ), array( 'chat' ) );
 	}
 
 	public function getToolDefinition(): array {
diff --git a/inc/Api/Chat/Tools/UpdateEvent.php b/inc/Api/Chat/Tools/UpdateEvent.php
index 1afaee5..295805c 100644
--- a/inc/Api/Chat/Tools/UpdateEvent.php
+++ b/inc/Api/Chat/Tools/UpdateEvent.php
@@ -21,7 +21,7 @@
 class UpdateEvent extends BaseTool {
 
 	public function __construct() {
-		$this->registerTool( 'chat', 'update_event', array( $this, 'getToolDefinition' ) );
+		$this->registerTool( 'update_event', array( $this, 'getToolDefinition' ), array( 'chat' ) );
 	}
 
 	public function getToolDefinition(): array {
diff --git a/inc/Api/Chat/Tools/UpdateVenue.php b/inc/Api/Chat/Tools/UpdateVenue.php
index af7cced..0623658 100644
--- a/inc/Api/Chat/Tools/UpdateVenue.php
+++ b/inc/Api/Chat/Tools/UpdateVenue.php
@@ -20,7 +20,7 @@
 class UpdateVenue extends BaseTool {
 
 	public function __construct() {
-		$this->registerTool( 'chat', 'update_venue', array( $this, 'getToolDefinition' ) );
+		$this->registerTool( 'update_venue', array( $this, 'getToolDefinition' ), array( 'chat' ) );
 	}
 
 	public function getToolDefinition(): array {
diff --git a/inc/Api/Chat/Tools/VenueHealthCheck.php b/inc/Api/Chat/Tools/VenueHealthCheck.php
index 1741682..588b030 100644
--- a/inc/Api/Chat/Tools/VenueHealthCheck.php
+++ b/inc/Api/Chat/Tools/VenueHealthCheck.php
@@ -21,7 +21,7 @@
 class VenueHealthCheck extends BaseTool {
 
 	public function __construct() {
-		$this->registerTool( 'chat', 'venue_health_check', array( $this, 'getToolDefinition' ) );
+		$this->registerTool( 'venue_health_check', array( $this, 'getToolDefinition' ), array( 'chat' ) );
 	}
 
 	public function getToolDefinition(): array {